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

Commit 5666c0d4 authored by Ugo Yu's avatar Ugo Yu Committed by Myles Watson
Browse files

Broadcast Bluetooth state to OFF properly 

In current logic, we broadcast Bluetooth state OFF at BLE_ON state.
However, if Bluetooth gets crashed, we won't have the chance to send OFF
intent as we never get to BLE_ON.

This change makes the BluetoothManagerService skips the OFF intent only
if the previous state is a BLE state.

Bug: 189271317
Bug: 195032127
Test: manual
Change-Id: I3936766ab8bdd45d59550dacb64bdc0323bb424d
(cherry picked from commit 1b2f8bc9843b2d6ba7ba199a89412c8fb632f508)
parent 7ec057d0

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

+24 −2
Original line number Diff line number Diff line
@@ -2505,6 +2505,16 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        mContext.sendBroadcastAsUser(intent, UserHandle.ALL, null, getTempAllowlistBroadcastOptions());

    }



    private boolean isBleState(int state) {

        switch (state) {

            case BluetoothAdapter.STATE_BLE_ON:

            case BluetoothAdapter.STATE_BLE_TURNING_ON:

            case BluetoothAdapter.STATE_BLE_TURNING_OFF:

                return true;

        }

        return false;

    }



    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,
@@ -2527,8 +2537,15 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                sendBluetoothServiceDownCallback();

                unbindAndFinish();

                sendBleStateChanged(prevState, newState);

                // Don't broadcast as it has already been broadcast before

                isStandardBroadcast = false;



                /* Currently, the OFF intent is broadcasted externally only when we transition

                 * from TURNING_OFF to BLE_ON state. So if the previous state is a BLE state,

                 * we are guaranteed that the OFF intent has been broadcasted earlier and we

                 * can safely skip it.

                 * Conversely, if the previous state is not a BLE state, it indicates that some

                 * sort of crash has occurred, moving us directly to STATE_OFF without ever

                 * passing through BLE_ON. We should broadcast the OFF intent in this case. */

                isStandardBroadcast = !isBleState(prevState);



            } else if (!intermediate_off) {

                // connect to GattService
@@ -2581,6 +2598,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                // Show prevState of BLE_ON as OFF to standard users

                prevState = BluetoothAdapter.STATE_OFF;

            }

            if (DBG) {

                Slog.d(TAG,

                        "Sending State Change: " + BluetoothAdapter.nameForState(prevState) + " > "

                                + BluetoothAdapter.nameForState(newState));

            }

            Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);

            intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_STATE, prevState);

            intent.putExtra(BluetoothAdapter.EXTRA_STATE, newState);