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

Commit 80127567 authored by Jack He's avatar Jack He
Browse files

LeAudioService: Use ReentrantReadWriteLock 

Currently, in LeAudioService we use synchronized blocks to acces
mGroupDescriptors list. Gradually, as we wrapped more and more code in
synchronized blocks, deadlocks and TimeoutExceptions started popping
around.

Examples include BT stack calling AF from synchronized block, and
then AF calling BT stack back, to check some property of LE Audio
device.

mGroupDescriptors are modified just in 3 places, so accessing it is
perfect candidate for usage of ReentrantReadWriteLock - it should solve
all the deadlocks.

Bug: 325674688
Bug: 326295400
Test: atest BluetoothInstrumentationTests
Test:
  1. Bond, unbond, reconnect LE Audio device, preferably one using CSIP.
  2. Observe logcat output and verify no TimeoutException is thrown from LeAudioService
Change-Id: Icdb944981ddceca39df95694933d05ffe78ee72e
parent bc75e6fa

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.