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

Commit 21f67a8f authored by William Escande's avatar William Escande
Browse files

Handle mode change cb in handler thread even the first time 

Bug: 282013616
Test: Manual toggle AirplaneMode
Change-Id: Ide499103880ba9664bcc504f4187eae77faa065b
parent 9b53b7c9

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

+26 −8
Original line number Diff line number Diff line
@@ -420,8 +420,6 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    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 + "): "
@@ -431,6 +429,8 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
                + ", isSatelliteModeOn()=" + isSatelliteModeOn()

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



        mHandler.removeCallbacksAndMessages(token);



        if (delayMs > 0) {

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

                    token, delayMs);
@@ -445,20 +445,38 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 


    @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)