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

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

Merge "LeAudioService: Ignore store of intents when LeAudioService is... 

Merge "LeAudioService: Ignore store of intents when LeAudioService is inactive" into main am: dfeb70b8

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



Change-Id: I42239c9212bf0a7efb8a415ec0c8bde261eec110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a5229ae dfeb70b8

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+7 −2
Original line number Diff line number Diff line
@@ -276,6 +276,11 @@ public class LeAudioServiceTest { 
    private class LeAudioIntentReceiver extends BroadcastReceiver {

        @Override

        public void onReceive(Context context, Intent intent) {

            /* Ignore intent when service is inactive */

            if (mService == null) {

                return;

            }



            if (BluetoothLeAudio.ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED

                    .equals(intent.getAction())) {

                try {
@@ -289,8 +294,8 @@ public class LeAudioServiceTest { 
                    assertWithMessage("Cannot add Intent to the Connection State queue: "

                            + e.getMessage()).fail();

                }

            }

            if (BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED.equals(intent.getAction())) {

            } else if (BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED.equals(

                    intent.getAction())) {

                try {

                    BluetoothDevice device = intent.getParcelableExtra(

                            BluetoothDevice.EXTRA_DEVICE);