From 1240bcec3da57ab79322d4b9450179b43478d044 Mon Sep 17 00:00:00 2001
From: Vlad Popa <pvlad@google.com>
Date: Mon, 19 Dec 2022 16:50:29 +0100
Subject: [PATCH] Protect broadcast for CHECK_MUSIC_ACTIVE

Test: check no unprotected errors in logs
Bug: 261462686
Change-Id: Ide644bd88d6c8a77961dd3aa558e1d51f763f9c4
Merged-In: Ide644bd88d6c8a77961dd3aa558e1d51f763f9c4
---
 core/res/AndroidManifest.xml                                  | 1 +
 services/core/java/com/android/server/audio/AudioService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b10df606f3345..31903e25f8fd2 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -315,6 +315,7 @@
     <protected-broadcast android:name="android.media.MASTER_BALANCE_CHANGED_ACTION" />
     <protected-broadcast android:name="android.media.SCO_AUDIO_STATE_CHANGED" />
     <protected-broadcast android:name="android.media.ACTION_SCO_AUDIO_STATE_UPDATED" />
+    <protected-broadcast android:name="com.android.server.audio.action.CHECK_MUSIC_ACTIVE" />
 
     <protected-broadcast android:name="android.intent.action.MEDIA_REMOVED" />
     <protected-broadcast android:name="android.intent.action.MEDIA_UNMOUNTED" />
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index dfb24670b26b8..c7c905e4066bc 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -10211,7 +10211,7 @@ public class AudioService extends IAudioService.Stub
     private static final int CHECK_MODE_FOR_UID_PERIOD_MS = 6000;
 
     private static final String ACTION_CHECK_MUSIC_ACTIVE =
-            AudioService.class.getSimpleName() + ".CHECK_MUSIC_ACTIVE";
+            "com.android.server.audio.action.CHECK_MUSIC_ACTIVE";
     private static final int REQUEST_CODE_CHECK_MUSIC_ACTIVE = 1;
 
     private int safeMediaVolumeIndex(int device) {