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

Commit 8a28ddff authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes Ic9061e7d,I847adfe0 into main am: 1637fc2a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2726922



Change-Id: Ie38863914de89435e42d925793af1b2d8cebcd72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4834a3d 1637fc2a

android/app/tests/unit/src/com/android/bluetooth/TestUtils.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -369,6 +369,7 @@ public class TestUtils { 
                }

                }

                if (line.startsWith("[")) {

                if (line.startsWith("[")) {

                    if (line.charAt(line.length() - 1) != ']') {

                    if (line.charAt(line.length() - 1) != ']') {

                        Log.e(TAG, "readAdapterConfig: config line is not correct: " + line);

                        return null;

                        return null;

                    }

                    }

                    section = line.substring(1, line.length() - 1);

                    section = line.substring(1, line.length() - 1);
@@ -380,6 +381,7 @@ public class TestUtils { 
                }

                }

            }

            }

        } catch (IOException e) {

        } catch (IOException e) {

            Log.e(TAG, "readAdapterConfig: Exception while reading the config" + e);

            return null;

            return null;

        }

        }

        return adapterConfig;

        return adapterConfig;

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

+12 −7
Original line number Original line Diff line number Diff line
@@ -179,7 +179,6 @@ public class AdapterServiceTest { 




    private PackageManager mMockPackageManager;

    private PackageManager mMockPackageManager;

    private MockContentResolver mMockContentResolver;

    private MockContentResolver mMockContentResolver;

    private HashMap<String, HashMap<String, String>> mAdapterConfig;

    private int mForegroundUserId;

    private int mForegroundUserId;

    private TestLooper mLooper;

    private TestLooper mLooper;
@@ -345,9 +344,6 @@ public class AdapterServiceTest { 
        mLooper.dispatchAll();

        mLooper.dispatchAll();





        mAdapterService.registerRemoteCallback(mIBluetoothCallback);

        mAdapterService.registerRemoteCallback(mIBluetoothCallback);



        mAdapterConfig = TestUtils.readAdapterConfig();

        assertThat(mAdapterConfig).isNotNull();

    }

    }





    @After

    @After
@@ -849,8 +845,11 @@ public class AdapterServiceTest { 
    @Test

    @Test

    @Ignore("b/296127545: This is a native test")

    @Ignore("b/296127545: This is a native test")

    public void testObfuscateBluetoothAddress_BluetoothDisabled() {

    public void testObfuscateBluetoothAddress_BluetoothDisabled() {

        HashMap<String, HashMap<String, String>> adapterConfig = TestUtils.readAdapterConfig();

        assertThat(adapterConfig).isNotNull();



        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        byte[] metricsSalt = getMetricsSalt(adapterConfig);

        assertThat(metricsSalt).isNotNull();

        assertThat(metricsSalt).isNotNull();

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

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

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

        byte[] obfuscatedAddress = mAdapterService.obfuscateAddress(device);
@@ -866,10 +865,13 @@ public class AdapterServiceTest { 
    @Test

    @Test

    @Ignore("b/296127545: This is a native test")

    @Ignore("b/296127545: This is a native test")

    public void testObfuscateBluetoothAddress_BluetoothEnabled() {

    public void testObfuscateBluetoothAddress_BluetoothEnabled() {

        HashMap<String, HashMap<String, String>> adapterConfig = TestUtils.readAdapterConfig();

        assertThat(adapterConfig).isNotNull();



        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        doEnable(false);

        doEnable(false);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_ON);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_ON);

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        byte[] metricsSalt = getMetricsSalt(adapterConfig);

        assertThat(metricsSalt).isNotNull();

        assertThat(metricsSalt).isNotNull();

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

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

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

        byte[] obfuscatedAddress = mAdapterService.obfuscateAddress(device);
@@ -882,8 +884,11 @@ public class AdapterServiceTest { 
    @Test

    @Test

    @Ignore("b/296127545: This is a native test")

    @Ignore("b/296127545: This is a native test")

    public void testObfuscateBluetoothAddress_PersistentBetweenToggle() {

    public void testObfuscateBluetoothAddress_PersistentBetweenToggle() {

        HashMap<String, HashMap<String, String>> adapterConfig = TestUtils.readAdapterConfig();

        assertThat(adapterConfig).isNotNull();



        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        byte[] metricsSalt = getMetricsSalt(mAdapterConfig);

        byte[] metricsSalt = getMetricsSalt(adapterConfig);

        assertThat(metricsSalt).isNotNull();

        assertThat(metricsSalt).isNotNull();

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

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

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

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