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

Commit b88ffcbd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Makes CSIP set member broadcasts ordered" into main

parents 724d3f64 3065c3eb

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

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

        intent.addFlags(

                Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        sendBroadcast(intent, BLUETOOTH_PRIVILEGED);

        sendOrderedBroadcast(intent, BLUETOOTH_PRIVILEGED);





        /* Notify registered parties */

        /* Notify registered parties */

        handleSetMemberAvailable(device, groupId);

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

        if (intent != null) {

            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            sendBroadcast(intent, BLUETOOTH_PRIVILEGED);

            sendOrderedBroadcast(intent, BLUETOOTH_PRIVILEGED);

        }

        }





        synchronized (mStateMachines) {

        synchronized (mStateMachines) {