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

Commit 2d289a63 authored by Aditi Katragadda's avatar Aditi Katragadda Committed by Automerger Merge Worker
Browse files

Merge "Randomize media ID to correct lost audio focus fix" into main am: 3deea822 

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



Change-Id: I1e0769a8174d848b20bc7483e66ea0a37a89762d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2110317 3deea822

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java

+1 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ public class AvrcpControllerStateMachineTest { 
    /** Get the root of the device */

    @Test

    public void testGetDeviceRootNode_flagRandomDeviceIdDisabled_rootNodeMatchesUuidFormat() {

        mSetFlagsRule.disableFlags(Flags.FLAG_RANDOMIZE_DEVICE_LEVEL_MEDIA_IDS);

        setUpConnectedState(true, true);

        final String rootName = "__ROOT__" + mTestDevice.getAddress().toString();

        // Get the root of the device

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/BrowseTreeTest.java

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public class BrowseTreeTest { 


    @Test

    public void findBrowseNodeByIDForDevice() {

        mSetFlagsRule.disableFlags(Flags.FLAG_RANDOMIZE_DEVICE_LEVEL_MEDIA_IDS);

        BrowseTree browseTree = new BrowseTree(mTestDevice);

        final String deviceId = BrowseTree.ROOT + mTestDevice.getAddress().toString();

        assertThat(browseTree.findBrowseNodeByID(deviceId)).isEqualTo(browseTree.mRootNode);