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

Commit af148462 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Delay user switch for until manager can handle it" am: 603a746a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2557512



Change-Id: If5706d78daf798acde779491cd4da3676acac641
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 593b5103 603a746a

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");

        }

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

+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());

        }

    }