From ce9ddee0cc908cfa97a161bb56941293978554b7 Mon Sep 17 00:00:00 2001 From: Rahul Sabnis Date: Thu, 14 Apr 2022 17:26:47 +0000 Subject: Revert "Save off foreground user id before passing the message to the handler on" This reverts commit eda5120b133e6f55951287b1dd85b4bd290a60e7. Reason for revert: The issue in the bug is still reproducible after this change was landed Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Change only present in tm-dev Change-Id: I8d818370bcd6694b17c77545538f25fa2bbe2e34 (cherry picked from commit 2fece9705427955c24e47ce197fe4a0c595c7860) Merged-In: I8d818370bcd6694b17c77545538f25fa2bbe2e34 --- .../android/server/bluetooth/BluetoothManagerService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java') diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index ff1d861293..4ee392f08d 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -1548,14 +1548,7 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { if (DBG) { Log.d(TAG, "User " + userHandle + " switched"); } - - // Save the foreground user id and propagate to BT process after it's restarted - int toUserId = userHandle.getIdentifier(); - if (mForegroundUserId != toUserId) { - mForegroundUserId = toUserId; - } - - mHandler.obtainMessage(MESSAGE_USER_SWITCHED, toUserId, 0).sendToTarget(); + mHandler.obtainMessage(MESSAGE_USER_SWITCHED, userHandle.getIdentifier(), 0).sendToTarget(); } /** @@ -2384,6 +2377,12 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { } mHandler.removeMessages(MESSAGE_USER_SWITCHED); + // Save the foreground user id and propagate to BT process after it's restarted + int toUserId = msg.arg1; + if (mForegroundUserId != toUserId) { + mForegroundUserId = toUserId; + } + /* disable and enable BT when detect a user switch */ if (mBluetooth != null && isEnabled()) { restartForReason(BluetoothProtoEnums.ENABLE_DISABLE_REASON_USER_SWITCH); -- cgit v1.2.3