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

Commit ea1b1b54 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle mode change cb in handler thread even the first time" am: eec1e478 

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



Change-Id: I891719e1c8e9e086e3e824ae74e3b81e678639b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 132bf602 eec1e478

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

+26 −8
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ class BluetoothManagerService { 
    }



    private void delayModeChangedIfNeeded(Object token, Runnable r, String modechanged) {

        mHandler.removeCallbacksAndMessages(token);



        final int state = getState();

        final int delayMs = estimateBusyTime(state);

        Log.d(TAG, "delayModeChangedIfNeeded(" + modechanged + "): "
@@ -416,6 +414,8 @@ class BluetoothManagerService { 
                + ", isSatelliteModeOn()=" + isSatelliteModeOn()

                + ", delayed=" + delayMs + "ms");



        mHandler.removeCallbacksAndMessages(token);



        if (delayMs > 0) {

            mHandler.postDelayed(() -> delayModeChangedIfNeeded(token, r, modechanged),

                    token, delayMs);
@@ -430,20 +430,38 @@ class BluetoothManagerService { 


    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    void onAirplaneModeChanged() {

        delayModeChangedIfNeeded(ON_AIRPLANE_MODE_CHANGED_TOKEN,

                () -> handleAirplaneModeChanged(), "onAirplaneModeChanged");

        mHandler.postDelayed(

                () ->

                        delayModeChangedIfNeeded(

                                ON_AIRPLANE_MODE_CHANGED_TOKEN,

                                () -> handleAirplaneModeChanged(),

                                "onAirplaneModeChanged"),

                ON_AIRPLANE_MODE_CHANGED_TOKEN,

                0);

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    void onSatelliteModeChanged() {

        delayModeChangedIfNeeded(ON_SATELLITE_MODE_CHANGED_TOKEN,

                () -> handleSatelliteModeChanged(), "onSatelliteModeChanged");

        mHandler.postDelayed(

                () ->

                        delayModeChangedIfNeeded(

                                ON_SATELLITE_MODE_CHANGED_TOKEN,

                                () -> handleSatelliteModeChanged(),

                                "onSatelliteModeChanged"),

                ON_SATELLITE_MODE_CHANGED_TOKEN,

                0);

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    void onSwitchUser(UserHandle userHandle) {

        delayModeChangedIfNeeded(ON_SWITCH_USER_TOKEN,

                () -> handleSwitchUser(userHandle), "onSwitchUser");

        mHandler.postDelayed(

                () ->

                        delayModeChangedIfNeeded(

                                ON_SWITCH_USER_TOKEN,

                                () -> handleSwitchUser(userHandle),

                                "onSwitchUser"),

                ON_SWITCH_USER_TOKEN,

                0);

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)