Merge "adb: check the current Settings values after adding ContentObserver" into main (0ee6dad0) · Commits · e / os / android_frameworks_base

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

+19 −1

Original line number	Diff line number	Diff line
		@@ -162,6 +162,20 @@ public class AdbService extends IAdbManager.Stub {
		mContentResolver.registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.ADB_WIFI_ENABLED),
		false, mObserver);

		/*
		* The observer will only trigger when the value changes.
		* We need to initialize the state according to the current setting value.
		*/
		if (Settings.Global.getInt(mContentResolver,
		Settings.Global.ADB_ENABLED, 0) != 0) {
		mObserver.setInitialAdbState(true, AdbTransportType.USB);
		}

		if (Settings.Global.getInt(mContentResolver,
		Settings.Global.ADB_WIFI_ENABLED, 0) != 0) {
		mObserver.setInitialAdbState(true, AdbTransportType.WIFI);
		}
		} catch (Exception e) {
		Slog.e(TAG, "Error in registerContentObservers", e);
		}
		@@ -197,6 +211,10 @@ public class AdbService extends IAdbManager.Stub {
		setAdbEnabled(shouldEnable, AdbTransportType.WIFI);
		}
		}

		private void setInitialAdbState(boolean enable, byte transportType) {
		setAdbEnabled(enable, transportType);
		}
		}

		private static final String TAG = AdbService.class.getSimpleName();
		@@ -221,7 +239,7 @@ public class AdbService extends IAdbManager.Stub {
		private boolean mIsAdbWifiEnabled;
		private final AdbDebuggingManager mDebuggingManager;

		private ContentObserver mObserver;
		private AdbSettingsObserver mObserver;

		private AdbService(Context context) {
		mContext = context;