Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eda5120b authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

Save off foreground user id before passing the message to the handler on 

user switches

Tag: #feature
Bug: 228920751
Test: Manual
Ignore-AOSP-First: Code only present in tm-dev
Change-Id: Ic7d3c94880832f240f9d85b850cf2ce9936e3622
parent 27edf930

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

+8 −7
Original line number Diff line number Diff line
@@ -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);