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

Commit 5a1439af authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify internal handling of BT enable 

Future CL will parameterize the binder call itself.

Bug: 145171640
Test: compile & atest BluetoothInstrumentationTests
Change-Id: Ia727342f19f8d88953ba09026eecd9fe079f987d
parent f59e9a96

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −10
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ public class AdapterService extends Service { 


            enforceBluetoothAdminPermission(service);



            return service.enable();

            return service.enable(false);

        }



        @Override
@@ -1120,7 +1120,7 @@ public class AdapterService extends Service { 


            enforceBluetoothAdminPermission(service);



            return service.enableNoAutoConnect();

            return service.enable(true);

        }



        @Override
@@ -2066,14 +2066,6 @@ public class AdapterService extends Service { 
        return BluetoothAdapter.STATE_OFF;

    }



    public boolean enable() {

        return enable(false);

    }



    public boolean enableNoAutoConnect() {

        return enable(true);

    }



    public synchronized boolean enable(boolean quietMode) {

        // Enforce the user restriction for disallowing Bluetooth if it was set.

        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_BLUETOOTH, UserHandle.SYSTEM)) {

android/app/src/com/android/bluetooth/btservice/ProfileObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class ProfileObserver extends ContentObserver { 
    private void onBluetoothOff() {

        mContext.unregisterReceiver(mStateObserver);

        Config.init(mContext);

        mService.enable();

        mService.enable(false);

    }



    public void stop() {

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public class AdapterServiceTest { 


        final int startServiceCalls = 2 * (onlyGatt ? 1 : 3); // Start and stop GATT + 2



        mAdapterService.enable();

        mAdapterService.enable(false);



        verifyStateChange(BluetoothAdapter.STATE_OFF, BluetoothAdapter.STATE_BLE_TURNING_ON,

                invocationNumber + 1, CONTEXT_SWITCH_MS);
@@ -316,7 +316,7 @@ public class AdapterServiceTest { 
    public void testGattStartTimeout() {

        Assert.assertFalse(mAdapterService.isEnabled());



        mAdapterService.enable();

        mAdapterService.enable(false);



        verifyStateChange(BluetoothAdapter.STATE_OFF, BluetoothAdapter.STATE_BLE_TURNING_ON, 1,

                CONTEXT_SWITCH_MS);
@@ -383,7 +383,7 @@ public class AdapterServiceTest { 
    public void testProfileStartTimeout() {

        Assert.assertFalse(mAdapterService.isEnabled());



        mAdapterService.enable();

        mAdapterService.enable(false);



        verifyStateChange(BluetoothAdapter.STATE_OFF, BluetoothAdapter.STATE_BLE_TURNING_ON, 1,

                CONTEXT_SWITCH_MS);