Merge "Delay user switch for until manager can handle it" (603a746a) · Commits · e / os / android_packages_modules_Bluetooth

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -434,6 +434,7 @@ public class BluetoothManagerService extends IBluetoothManager.Stub {

		private static final Object ON_AIRPLANE_MODE_CHANGED_TOKEN = new Object();
		private static final Object ON_SATELLITE_MODE_CHANGED_TOKEN = new Object();
		private static final Object ON_SWITCH_USER_TOKEN = new Object();

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		void onAirplaneModeChanged() {
		@@ -447,6 +448,12 @@ public class BluetoothManagerService extends IBluetoothManager.Stub {
		() -> handleSatelliteModeChanged(), "onSatelliteModeChanged");
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		void onSwitchUser(UserHandle userHandle) {
		delayModeChangedIfNeeded(ON_SWITCH_USER_TOKEN,
		() -> handleSwitchUser(userHandle), "onSwitchUser");
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		private void handleAirplaneModeChanged() {
		synchronized (this) {
		@@ -1828,7 +1835,7 @@ public class BluetoothManagerService extends IBluetoothManager.Stub {
		/**
		* Called when switching to a different foreground user.
		*/
		public void handleOnSwitchUser(UserHandle userHandle) {
		void handleSwitchUser(UserHandle userHandle) {
		if (DBG) {
		Log.d(TAG, "User " + userHandle + " switched");
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ public class BluetoothService extends SystemService {
		if (!mInitialized) {
		initialize();
		} else {
		mBluetoothManagerService.handleOnSwitchUser(to.getUserHandle());
		mBluetoothManagerService.onSwitchUser(to.getUserHandle());
		}
		}