Merge "MediaOutputController: Distinguish broadcast check context in logs" into udc-qpr-dev (d9635853) · Commits · e / os / android_frameworks_base

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");