Adb wifi acquires multicast lock (16229490) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/adb/AdbService.java

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.debug.IAdbTransport;
	import android.debug.PairDevice;		import android.debug.PairDevice;
	import android.hardware.usb.UsbManager;		import android.hardware.usb.UsbManager;
	import android.net.Uri;		import android.net.Uri;
			import android.net.wifi.WifiManager;
	import android.os.Binder;		import android.os.Binder;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.ParcelFileDescriptor;		import android.os.ParcelFileDescriptor;
	@@ -192,6 +193,7 @@ public class AdbService extends IAdbManager.Stub {

	@Override		@Override
	public void onChange(boolean selfChange, @NonNull Uri uri, @UserIdInt int userId) {		public void onChange(boolean selfChange, @NonNull Uri uri, @UserIdInt int userId) {
			Slog.d("AdbSettingsObserver", "onChange " + uri.toString());
	if (mAdbUsbUri.equals(uri)) {		if (mAdbUsbUri.equals(uri)) {
	boolean shouldEnable = (Settings.Global.getInt(mContentResolver,		boolean shouldEnable = (Settings.Global.getInt(mContentResolver,
	Settings.Global.ADB_ENABLED, 0) > 0);		Settings.Global.ADB_ENABLED, 0) > 0);
	@@ -417,6 +419,28 @@ public class AdbService extends IAdbManager.Stub {
	}		}
	}		}

			private WifiManager.MulticastLock mAdbMulticastLock = null;

			private void acquireMulticastLock() {
			if (mAdbMulticastLock == null) {
			WifiManager wifiManager = (WifiManager)
			mContext.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
			mAdbMulticastLock = wifiManager.createMulticastLock("AdbMulticastLock");
			}

			if (!mAdbMulticastLock.isHeld()) {
			mAdbMulticastLock.acquire();
			Slog.d(TAG, "Acquired multicast lock");
			}
			}

			private void releaseMulticastLock() {
			if (mAdbMulticastLock != null && mAdbMulticastLock.isHeld()) {
			mAdbMulticastLock.release();
			Slog.d(TAG, "Released multicast lock");
			}
			}

	private void setAdbEnabled(boolean enable, byte transportType) {		private void setAdbEnabled(boolean enable, byte transportType) {
	Slog.d(TAG, "setAdbEnabled(" + enable + "), mIsAdbUsbEnabled=" + mIsAdbUsbEnabled		Slog.d(TAG, "setAdbEnabled(" + enable + "), mIsAdbUsbEnabled=" + mIsAdbUsbEnabled
	+ ", mIsAdbWifiEnabled=" + mIsAdbWifiEnabled + ", transportType=" + transportType);		+ ", mIsAdbWifiEnabled=" + mIsAdbWifiEnabled + ", transportType=" + transportType);
	@@ -428,9 +452,11 @@ public class AdbService extends IAdbManager.Stub {
	if (mIsAdbWifiEnabled) {		if (mIsAdbWifiEnabled) {
	// Start adb over WiFi.		// Start adb over WiFi.
	SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "1");		SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "1");
			acquireMulticastLock();
	} else {		} else {
	// Stop adb over WiFi.		// Stop adb over WiFi.
	SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "0");		SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "0");
			releaseMulticastLock();
	}		}
	} else {		} else {
	// No change		// No change