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

Commit 46ac5265 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify implementation of isEnabled 

Implement in terms of getState()

Future CL will remove this API from the AIDL.

Reimplement test methods in terms of getState,
and remove references in other tests as they don't
actually reference isEnabled under the hood.

Bug: 45171640
Test: compile
Change-Id: I73ebecb759493515f25c510208c3f4ab5b93d3a4
parent 4e6b4435

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

+1 −5
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.isEnabled();

            return service.getState() == BluetoothAdapter.STATE_ON;

        }



        @Override
@@ -2051,10 +2051,6 @@ public class AdapterService extends Service { 


    // ----API Methods--------



    public boolean isEnabled() {

        return mAdapterProperties.getState() == BluetoothAdapter.STATE_ON;

    }



    public int getState() {

        if (mAdapterProperties != null) {

            return mAdapterProperties.getState();

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

+23 −23
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class AdapterServiceTest { 
    }



    private void doEnable(int invocationNumber, boolean onlyGatt) {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        final int startServiceCalls = 2 * (onlyGatt ? 1 : 3); // Start and stop GATT + 2
@@ -223,11 +223,11 @@ public class AdapterServiceTest { 
        final int scanMode = mAdapterService.getScanMode();

        Assert.assertTrue(scanMode == BluetoothAdapter.SCAN_MODE_CONNECTABLE

                || scanMode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);

        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

    }



    private void doDisable(int invocationNumber, boolean onlyGatt) {

        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        final int startServiceCalls = 2 * (onlyGatt ? 1 : 3); // Start and stop GATT + 2
@@ -260,7 +260,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_OFF, BluetoothAdapter.STATE_OFF,

                invocationNumber + 1, NATIVE_DISABLE_MS);



        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

    }



    /**
@@ -314,7 +314,7 @@ public class AdapterServiceTest { 
     */

    @Test

    public void testGattStartTimeout() {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        mAdapterService.enable(false);
@@ -336,7 +336,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_OFF, BluetoothAdapter.STATE_OFF, 1,

                NATIVE_DISABLE_MS);



        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

    }



    /**
@@ -346,7 +346,7 @@ public class AdapterServiceTest { 
    @Test

    public void testGattStopTimeout() {

        doEnable(0, false);

        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        mAdapterService.disable();
@@ -372,7 +372,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_OFF, BluetoothAdapter.STATE_OFF, 1,

                AdapterState.BLE_STOP_TIMEOUT_DELAY + NATIVE_DISABLE_MS);



        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

    }



    /**
@@ -381,7 +381,7 @@ public class AdapterServiceTest { 
     */

    @Test

    public void testProfileStartTimeout() {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        mAdapterService.enable(false);
@@ -426,7 +426,7 @@ public class AdapterServiceTest { 
    public void testProfileStopTimeout() {

        doEnable(0, false);



        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        mAdapterService.disable();
@@ -448,7 +448,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_OFF, BluetoothAdapter.STATE_OFF, 1,

                AdapterState.BLE_STOP_TIMEOUT_DELAY + NATIVE_DISABLE_MS);



        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

    }



    /**
@@ -462,7 +462,7 @@ public class AdapterServiceTest { 
        SystemProperties.set(AdapterService.BLUETOOTH_BTSNOOP_LOG_MODE_PROPERTY, "false");

        doEnable(0, false);



        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        Assert.assertFalse(

                SystemProperties.get(AdapterService.BLUETOOTH_BTSNOOP_LOG_MODE_PROPERTY,
@@ -495,7 +495,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_OFF, BluetoothAdapter.STATE_OFF, 1,

                NATIVE_DISABLE_MS);



        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);



        // Restore earlier setting

        SystemProperties.set(AdapterService.BLUETOOTH_BTSNOOP_LOG_MODE_PROPERTY, snoopSetting);
@@ -518,7 +518,7 @@ public class AdapterServiceTest { 
     */

    @Test

    public void testObfuscateBluetoothAddress_BluetoothDisabled() {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        Assert.assertNotNull(metricsSalt);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);
@@ -534,9 +534,9 @@ public class AdapterServiceTest { 
     */

    @Test

    public void testObfuscateBluetoothAddress_BluetoothEnabled() {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        doEnable(0, false);

        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        Assert.assertNotNull(metricsSalt);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);
@@ -551,7 +551,7 @@ public class AdapterServiceTest { 
     */

    @Test

    public void testObfuscateBluetoothAddress_PersistentBetweenToggle() {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        Assert.assertNotNull(metricsSalt);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);
@@ -562,7 +562,7 @@ public class AdapterServiceTest { 
                obfuscatedAddress1);

        // Enable

        doEnable(0, false);

        Assert.assertTrue(mAdapterService.isEnabled());

        Assert.assertTrue(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        byte[] obfuscatedAddress3 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress3.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress3));
@@ -570,7 +570,7 @@ public class AdapterServiceTest { 
                obfuscatedAddress1);

        // Disable

        doDisable(0, false);

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        byte[] obfuscatedAddress4 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress4.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress4));
@@ -587,7 +587,7 @@ public class AdapterServiceTest { 
            PackageManager.NameNotFoundException {

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        Assert.assertNotNull(metricsSalt);

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress1.length > 0);
@@ -596,7 +596,7 @@ public class AdapterServiceTest { 
                obfuscatedAddress1);

        tearDown();

        setUp();

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        byte[] obfuscatedAddress2 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress2.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress2));
@@ -623,7 +623,7 @@ public class AdapterServiceTest { 
            + " after factory reset")

    @Test

    public void testObfuscateBluetoothAddress_FactoryReset() {

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress1.length > 0);
@@ -657,7 +657,7 @@ public class AdapterServiceTest { 
            PackageManager.NameNotFoundException {

        byte[] metricsSalt1 = getMetricsSalt(mAdapterConfig);

        Assert.assertNotNull(metricsSalt1);

        Assert.assertFalse(mAdapterService.isEnabled());

        Assert.assertFalse(mAdapterService.getState() == BluetoothAdapter.STATE_ON);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress1.length > 0);

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetServiceAndStateMachineTest.java

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ public class HeadsetServiceAndStateMachineTest { 
        mVoiceRecognitionWakeLock =

                powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VoiceRecognitionTest");

        TestUtils.setAdapterService(mAdapterService);

        doReturn(true).when(mAdapterService).isEnabled();

        doReturn(MAX_HEADSET_CONNECTIONS).when(mAdapterService).getMaxConnectedAudioDevices();

        doReturn(new ParcelUuid[]{BluetoothUuid.Handsfree}).when(mAdapterService)

                .getRemoteUuids(any(BluetoothDevice.class));

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ public class HeadsetServiceTest { 
                HeadsetObjectsFactory.class);

        method.setAccessible(true);

        method.invoke(null, mObjectsFactory);

        doReturn(true).when(mAdapterService).isEnabled();

        doReturn(MAX_HEADSET_CONNECTIONS).when(mAdapterService).getMaxConnectedAudioDevices();

        doReturn(new ParcelUuid[]{BluetoothUuid.Handsfree}).when(mAdapterService)

                .getRemoteUuids(any(BluetoothDevice.class));