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

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

Merge "[le audio] Broadcast reset saved fallback active device" into main am:... 

Merge "[le audio] Broadcast reset saved fallback active device" into main am: 64a2e04f am: c5dca6a1

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



Change-Id: I37425b0bf3fc4493c6643553adddac5f8ff29900
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de2e0924 c5dca6a1

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

+4 −2
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ 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);
@@ -499,7 +500,8 @@ public class LeAudioService extends ProfileService { 
        }



        mAudioManager.unregisterAudioDeviceCallback(mAudioManagerAudioDeviceCallback);



        // clear mUnicastGroupIdDeactivatedForBroadcastTransition to default

        updateFallbackUnicastGroupIdForBroadcast(LE_AUDIO_GROUP_ID_INVALID);

        mAdapterService = null;

        mAudioManager = null;

        mMcpService = null;