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

Commit 995c90aa authored by Christine Hallstrom's avatar Christine Hallstrom
Browse files

Properly check if BT is off when shutting down radios 

Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.

Bug: 27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
parent ce8e88aa

core/java/android/bluetooth/IBluetoothManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ interface IBluetoothManager 
    boolean enable();

    boolean enableNoAutoConnect();

    boolean disable(boolean persist);

    int getState();

    IBluetoothGatt getBluetoothGatt();



    boolean bindBluetoothProfileService(int profile, IBluetoothProfileServiceConnection proxy);

services/core/java/com/android/server/BluetoothManagerService.java

+18 −0
Original line number Diff line number Diff line
@@ -425,6 +425,24 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        return false;

    }



    public int getState() {

        if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&

                (!checkIfCallerIsForegroundUser())) {

            Slog.w(TAG, "getState(): not allowed for non-active and non system user");

            return BluetoothAdapter.STATE_OFF;

        }



        try {

            mBluetoothLock.readLock().lock();

            if (mBluetooth != null) return mBluetooth.getState();

        } catch (RemoteException e) {

            Slog.e(TAG, "getState()", e);

        } finally {

            mBluetoothLock.readLock().unlock();

        }

        return BluetoothAdapter.STATE_OFF;

    }



    class ClientDeathRecipient implements IBinder.DeathRecipient {

        public void binderDied() {

            if (DBG) Slog.d(TAG, "Binder is dead -  unregister Ble App");

services/core/java/com/android/server/power/ShutdownThread.java

+3 −2
Original line number Diff line number Diff line
@@ -543,7 +543,8 @@ public final class ShutdownThread extends Thread { 
                }



                try {

                    bluetoothOff = bluetooth == null || !bluetooth.isEnabled();

                    bluetoothOff = bluetooth == null ||

                            bluetooth.getState() == BluetoothAdapter.STATE_OFF;

                    if (!bluetoothOff) {

                        Log.w(TAG, "Disabling Bluetooth...");

                        bluetooth.disable(false);  // disable but don't persist new state
@@ -577,7 +578,7 @@ public final class ShutdownThread extends Thread { 


                    if (!bluetoothOff) {

                        try {

                            bluetoothOff = !bluetooth.isEnabled();

                            bluetoothOff = bluetooth.getState() == BluetoothAdapter.STATE_OFF;

                        } catch (RemoteException ex) {

                            Log.e(TAG, "RemoteException during bluetooth shutdown", ex);

                            bluetoothOff = true;