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

Commit f51b3121 authored by William Escande's avatar William Escande
Browse files

SystemServer: unbind prior to setting state 

When transitioning to stateOff, the caller of `waitForState` are
notified before the unbind is completed.
The caller will expect that when reaching OFF, everything is OFF.

By calling unbindAndFinish prior to setting the state, we reduce the
probability of this scenario

Test: atest ServiceBluetoothRoboTests
Test: atest ServiceBluetoothTests
Test: atest CtsBluetoothTestCases
Test: basically any code that toggles Bluetooth off and on
Flag: Exempt this targets flakiness and is checked with abtd
Bug: 361850050
Change-Id: If3a5e6e358e295a2f77619d5f1c82c69c950a6e2
parent b0ab751e

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

+8 −5
Original line number Diff line number Diff line
@@ -1951,6 +1951,14 @@ class BluetoothManagerService { 
            Log.d(TAG, "bluetoothStateChangeHandler: Already in state " + mState);

            return;

        }



        if (newState == STATE_OFF) {

            // If Bluetooth is off, send service down event to proxy objects, and unbind

            Log.d(TAG, "bluetoothStateChangeHandler: Bluetooth is OFF send Service Down");

            sendBluetoothServiceDownCallback();

            unbindAndFinish();

        }



        mState.set(newState);



        broadcastIntentStateChange(BluetoothAdapter.ACTION_BLE_STATE_CHANGED, prevState, newState);
@@ -1978,11 +1986,6 @@ class BluetoothManagerService { 
                AutoOnFeature.notifyBluetoothOn(mCurrentUserContext);

            }

            sendBluetoothOnCallback();

        } else if (newState == STATE_OFF) {

            // If Bluetooth is off, send service down event to proxy objects, and unbind

            Log.d(TAG, "bluetoothStateChangeHandler: Bluetooth is OFF send Service Down");

            sendBluetoothServiceDownCallback();

            unbindAndFinish();

        } else if (newState == STATE_BLE_ON && prevState == STATE_BLE_TURNING_ON) {

            continueFromBleOnState();

        } // Nothing specific to do for STATE_TURNING_<X>