Merge cherrypicks of [17749071] into tm-release.

Change-Id: Ib5dcc6e61670c0cf160e8d02d74dc04537b5ec4c

1 files changed, 8 insertions, 7 deletions

diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java
index 4ee392f08d..ff1d861293 100644
--- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java
+++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java
@@ -1548,7 +1548,14 @@ public class BluetoothManagerService extends IBluetoothManager.Stub {
         if (DBG) {
             Log.d(TAG, "User " + userHandle + " switched");
         }
-        mHandler.obtainMessage(MESSAGE_USER_SWITCHED, userHandle.getIdentifier(), 0).sendToTarget();
+
+        // 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();
     }
 
     /**
@@ -2377,12 +2384,6 @@ 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);