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

Commit a42ca71f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Makes CSIP set member broadcasts ordered" into main am: b88ffcbd 

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



Change-Id: I1d5003ae0427e0fdb83eee9119e1d4d0c5f271d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 164837bc b88ffcbd

android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java

+2 −2
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
        intent.addFlags(

                Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        sendBroadcast(intent, BLUETOOTH_PRIVILEGED);

        sendOrderedBroadcast(intent, BLUETOOTH_PRIVILEGED);



        /* Notify registered parties */

        handleSetMemberAvailable(device, groupId);
@@ -890,7 +890,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
        if (intent != null) {

            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            sendBroadcast(intent, BLUETOOTH_PRIVILEGED);

            sendOrderedBroadcast(intent, BLUETOOTH_PRIVILEGED);

        }



        synchronized (mStateMachines) {