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

Commit 42228094 authored by Grzegorz Kolodziejczyk's avatar Grzegorz Kolodziejczyk Committed by Automerger Merge Worker
Browse files

Merge "MediaOutputController: Distinguish broadcast check context in logs"... 

Merge "MediaOutputController: Distinguish broadcast check context in logs" into udc-qpr-dev am: d9635853

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24296454



Change-Id: Ia5e4da9c9cf1e6c6739ee2d129206e93ef8b375f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 818732ce d9635853

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+10 −6
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        LocalBluetoothLeBroadcast broadcast =

                mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();

        if (broadcast == null) {

            Log.d(TAG, "getBroadcastMetadata: LE Audio Broadcast is null");

            Log.d(TAG, "getLocalBroadcastMetadataQrCodeString: LE Audio Broadcast is null");

            return "";

        }

        final LocalBluetoothLeBroadcastMetadata metadata =
@@ -1097,7 +1097,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        LocalBluetoothLeBroadcastAssistant assistant =

                mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastAssistantProfile();

        if (assistant == null) {

            Log.d(TAG, "The broadcast assistant profile is null");

            Log.d(TAG, "getConnectedBroadcastSinkDevices: The broadcast assistant profile is null");

            return null;

        }
@@ -1108,7 +1108,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        LocalBluetoothLeBroadcastAssistant assistant =

                mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastAssistantProfile();

        if (assistant == null) {

            Log.d(TAG, "The broadcast assistant profile is null");

            Log.d(TAG, "isThereAnyBroadcastSourceIntoSinkDevice: The broadcast assistant profile "

                    + "is null");

            return false;

        }

        List<BluetoothLeBroadcastReceiveState> sourceList = assistant.getAllSources(sink);
@@ -1121,7 +1122,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        LocalBluetoothLeBroadcastAssistant assistant =

                mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastAssistantProfile();

        if (assistant == null) {

            Log.d(TAG, "The broadcast assistant profile is null");

            Log.d(TAG, "addSourceIntoSinkDeviceWithBluetoothLeAssistant: The broadcast assistant "

                    + "profile is null");

            return false;

        }

        assistant.addSource(sink, metadata, isGroupOp);
@@ -1134,7 +1136,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        LocalBluetoothLeBroadcastAssistant assistant =

                mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastAssistantProfile();

        if (assistant == null) {

            Log.d(TAG, "The broadcast assistant profile is null");

            Log.d(TAG, "registerLeBroadcastAssistantServiceCallback: The broadcast assistant "

                    + "profile is null");

            return;

        }

        Log.d(TAG, "Register LE broadcast assistant callback");
@@ -1146,7 +1149,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        LocalBluetoothLeBroadcastAssistant assistant =

                mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastAssistantProfile();

        if (assistant == null) {

            Log.d(TAG, "The broadcast assistant profile is null");

            Log.d(TAG, "unregisterLeBroadcastAssistantServiceCallback: The broadcast assistant "

                    + "profile is null");

            return;

        }

        Log.d(TAG, "Unregister LE broadcast assistant callback");