Adding a flag for enabling directWifiManger instead of using

PeerConnectionFactory to break off the dependency.

- This is required so that Android app that doesn't use the
  peerconnection_java as dependency can include android monitor
  directly without incurring size bloat.

Bug: None
Change-Id: I7b3453f268467550c0a4b3a0bbf858d55d2fd8a4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/229322
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Tim Na <natim@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34829}
This commit is contained in:
Tim Na 2021-08-19 10:56:49 -07:00 committed by WebRTC LUCI CQ
parent f3db00f832
commit 2c8567b87a

View file

@ -565,6 +565,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
private ConnectivityManagerDelegate connectivityManagerDelegate;
private WifiManagerDelegate wifiManagerDelegate;
private WifiDirectManagerDelegate wifiDirectManagerDelegate;
private static boolean includeWifiDirect;
private boolean isRegistered;
private NetworkChangeDetector.ConnectionType connectionType;
@ -583,7 +584,8 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
wifiSSID = getWifiSSID(networkState);
intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
if (PeerConnectionFactory.fieldTrialsFindFullName("IncludeWifiDirect").equals("Enabled")) {
if (PeerConnectionFactory.fieldTrialsFindFullName("IncludeWifiDirect").equals("Enabled")
|| includeWifiDirect) {
wifiDirectManagerDelegate = new WifiDirectManagerDelegate(observer, context);
}
@ -607,6 +609,11 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
}
}
/** Enables WifiDirectManager. */
public static void setIncludeWifiDirect(boolean enable) {
includeWifiDirect = enable;
}
@Override
public boolean supportNetworkCallback() {
return connectivityManagerDelegate.supportNetworkCallback();