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

Commit 9a4f6142 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes I512ecd80,I5507e687,Ic395af29,I7076c1e0,I5b8900df, ... 

* changes:
  Move dump permission check to the binder
  Simplify LE up & BREDR down
  Simplify get/set custom metadata
  Simplify metadata listener registration & unregistration
  Simplify isActivityAndEnergyReportingSupported
  Remove unnecessary parens
  Simplify check for support for multiple advertisement
  Simplify callback register and unregister
  Simplify factoryReset
  Simplify getBatteryLevel
  Simplify sdpSearch
  Simplify getSocketManager
  Remove unnecessary boolean return from set pbap/map/sap
  Simplify get sim access permission
  Collapse common logic between pbap/map/sap permissions
  Simplify getMessageAccessPermission
  Reorder silence mode APIs
  Simplify get/set silence mode
  Simplify getPhonebookAccessPermission
  Simplify setPairingResponse
  Simplify setPasskey
  Simplify setPin
  Simplify remote device bonding or bonded checks
  Simplify bond reply logging
  Simplify fetchRemoteUuids
  Simplify remote device class/alias/type
  Simplify connection state & supported profiles
  Move remaining permission checks to the binder stub
parents 07b85abd 310466a7

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

+257 −335

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/bluetooth/btservice/RemoteDevices.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -336,6 +336,14 @@ final class RemoteDevices { 
            }

            }

        }

        }





        boolean isBonding() {

            return getBondState() == BluetoothDevice.BOND_BONDING;

        }



        boolean isBondingOrBonded() {

            return isBonding() || getBondState() == BluetoothDevice.BOND_BONDED;

        }



        /**

        /**

         * @param isBondingInitiatedLocally wether bonding is initiated locally

         * @param isBondingInitiatedLocally wether bonding is initiated locally

         */

         */

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ public class AdapterServiceTest { 
        mAdapterService.attach(mMockContext, null, null, null, null, null);

        mAdapterService.attach(mMockContext, null, null, null, null, null);





        mAdapterService.onCreate();

        mAdapterService.onCreate();

        mAdapterService.registerCallback(mIBluetoothCallback);

        mServiceBinder.registerCallback(mIBluetoothCallback);





        Config.init(mMockContext);

        Config.init(mMockContext);
@@ -169,7 +169,7 @@ public class AdapterServiceTest { 




    @After

    @After

    public void tearDown() {

    public void tearDown() {

        mAdapterService.unregisterCallback(mIBluetoothCallback);

        mServiceBinder.unregisterCallback(mIBluetoothCallback);

        mAdapterService.cleanup();

        mAdapterService.cleanup();

        Config.init(InstrumentationRegistry.getTargetContext());

        Config.init(InstrumentationRegistry.getTargetContext());

    }

    }
@@ -202,7 +202,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_ON, BluetoothAdapter.STATE_BLE_ON,

        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_ON, BluetoothAdapter.STATE_BLE_ON,

                invocationNumber + 1, NATIVE_INIT_MS);

                invocationNumber + 1, NATIVE_INIT_MS);





        mAdapterService.onLeServiceUp();

        mServiceBinder.onLeServiceUp();





        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_TURNING_ON,

        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_TURNING_ON,

                invocationNumber + 1, CONTEXT_SWITCH_MS);

                invocationNumber + 1, CONTEXT_SWITCH_MS);
@@ -249,7 +249,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_TURNING_OFF, BluetoothAdapter.STATE_BLE_ON,

        verifyStateChange(BluetoothAdapter.STATE_TURNING_OFF, BluetoothAdapter.STATE_BLE_ON,

                invocationNumber + 1, CONTEXT_SWITCH_MS);

                invocationNumber + 1, CONTEXT_SWITCH_MS);





        mAdapterService.onBrEdrDown();

        mServiceBinder.onBrEdrDown();





        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_BLE_TURNING_OFF,

        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_BLE_TURNING_OFF,

                invocationNumber + 1, CONTEXT_SWITCH_MS);

                invocationNumber + 1, CONTEXT_SWITCH_MS);
@@ -363,7 +363,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_TURNING_OFF, BluetoothAdapter.STATE_BLE_ON, 1,

        verifyStateChange(BluetoothAdapter.STATE_TURNING_OFF, BluetoothAdapter.STATE_BLE_ON, 1,

                CONTEXT_SWITCH_MS);

                CONTEXT_SWITCH_MS);





        mAdapterService.onBrEdrDown();

        mServiceBinder.onBrEdrDown();





        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_BLE_TURNING_OFF, 1,

        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_BLE_TURNING_OFF, 1,

                CONTEXT_SWITCH_MS);

                CONTEXT_SWITCH_MS);
@@ -398,7 +398,7 @@ public class AdapterServiceTest { 
        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_ON, BluetoothAdapter.STATE_BLE_ON, 1,

        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_ON, BluetoothAdapter.STATE_BLE_ON, 1,

                NATIVE_INIT_MS);

                NATIVE_INIT_MS);





        mAdapterService.onLeServiceUp();

        mServiceBinder.onLeServiceUp();





        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_TURNING_ON, 1,

        verifyStateChange(BluetoothAdapter.STATE_BLE_ON, BluetoothAdapter.STATE_TURNING_ON, 1,

                CONTEXT_SWITCH_MS);

                CONTEXT_SWITCH_MS);
@@ -630,7 +630,7 @@ public class AdapterServiceTest { 
        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

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

        Assert.assertTrue(obfuscatedAddress1.length > 0);

        Assert.assertTrue(obfuscatedAddress1.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress1));

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress1));

        mAdapterService.factoryReset();

        mServiceBinder.factoryReset();

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

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

        Assert.assertTrue(obfuscatedAddress2.length > 0);

        Assert.assertTrue(obfuscatedAddress2.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress2));

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

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress3));

        Assert.assertArrayEquals(obfuscatedAddress3,

        Assert.assertArrayEquals(obfuscatedAddress3,

                obfuscatedAddress2);

                obfuscatedAddress2);

        mAdapterService.factoryReset();

        mServiceBinder.factoryReset();

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

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

        Assert.assertTrue(obfuscatedAddress4.length > 0);

        Assert.assertTrue(obfuscatedAddress4.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress4));

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

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress1));

        Assert.assertArrayEquals(obfuscateInJava(metricsSalt1, device),

        Assert.assertArrayEquals(obfuscateInJava(metricsSalt1, device),

                obfuscatedAddress1);

                obfuscatedAddress1);

        mAdapterService.factoryReset();

        mServiceBinder.factoryReset();

        tearDown();

        tearDown();

        setUp();

        setUp();

        // Cannot verify metrics salt since it is not written to disk until native cleanup

        // Cannot verify metrics salt since it is not written to disk until native cleanup