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

Commit bbe3d6d7 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "LeAudioService: Use ReentrantReadWriteLock" into main am: e8160a71 am: 35c3320e 

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



Change-Id: Id3f60505debfed3df6efacdd3ffc5ccae4d49d9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e4af32d 35c3320e

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+346 −132

File changed.

Preview size limit exceeded, changes collapsed.

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioBinderTest.java

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ public class LeAudioBinderTest { 
        doReturn(mAudioRoutingManager).when(mAdapterService).getActiveDeviceManager();



        mFakeFlagsImpl = new FakeFeatureFlagsImpl();

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_API_SYNCHRONIZED_BLOCK_FIX, false);



        mLeAudioService =

                spy(

                        new LeAudioService(

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioBroadcastServiceTest.java

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ public class LeAudioBroadcastServiceTest { 
        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_UNICAST_INACTIVATE_DEVICE_BASED_ON_CONTEXT, false);

        mFakeFlagsImpl.setFlag(Flags.FLAG_AUDIO_ROUTING_CENTRALIZATION, false);

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_BROADCAST_AUDIO_HANDOVER_POLICIES, false);

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_API_SYNCHRONIZED_BLOCK_FIX, false);

        mService.setFeatureFlags(mFakeFlagsImpl);



        mService.mAudioManager = mAudioManager;

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+7 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ public class LeAudioServiceTest { 
        mFakeFlagsImpl.setFlag(Flags.FLAG_AUDIO_ROUTING_CENTRALIZATION, false);

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_BROADCAST_AUDIO_HANDOVER_POLICIES, false);

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_MCS_TBS_AUTHORIZATION_REBOND_FIX, false);

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_API_SYNCHRONIZED_BLOCK_FIX, false);

        mService.setFeatureFlags(mFakeFlagsImpl);



        mService.mAudioManager = mAudioManager;
@@ -939,6 +940,12 @@ public class LeAudioServiceTest { 
        verify(mMcpService, times(1)).removeDeviceAuthorizationInfo(mLeftDevice);

    }



    @Test

    public void testAuthorizationInfoRemovedFromTbsMcsOnUnbondEventsWithSynchBlockFixFlag() {

        mFakeFlagsImpl.setFlag(Flags.FLAG_LEAUDIO_API_SYNCHRONIZED_BLOCK_FIX, true);



        testAuthorizationInfoRemovedFromTbsMcsOnUnbondEvents();

    }

    /**

     * Test that a CONNECTION_STATE_DISCONNECTED Le Audio stack event will remove the state

     * machine only if the device is unbond.