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

Commit 2261591a authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "Revert "[le audio] Broadcast reset saved fallback active device"" into... 

Merge "Revert "[le audio] Broadcast reset saved fallback active device"" into main am: 0c3e3955 am: 5b08d1b9

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



Change-Id: I13a24fd75297a610cef54f99a75291aab9d434c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df2f8023 5b08d1b9

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

+2 −4
Original line number Diff line number Diff line
@@ -372,8 +372,7 @@ public class LeAudioService extends ProfileService { 


        mAudioManager.registerAudioDeviceCallback(mAudioManagerAudioDeviceCallback,

                       mHandler);

        // clear mUnicastGroupIdDeactivatedForBroadcastTransition to default

        updateFallbackUnicastGroupIdForBroadcast(LE_AUDIO_GROUP_ID_INVALID);



        // Mark service as started

        setLeAudioService(this);
@@ -500,8 +499,7 @@ public class LeAudioService extends ProfileService { 
        }



        mAudioManager.unregisterAudioDeviceCallback(mAudioManagerAudioDeviceCallback);

        // clear mUnicastGroupIdDeactivatedForBroadcastTransition to default

        updateFallbackUnicastGroupIdForBroadcast(LE_AUDIO_GROUP_ID_INVALID);



        mAdapterService = null;

        mAudioManager = null;

        mMcpService = null;