diff options
| author | 2023-01-31 13:56:05 +0000 | |
|---|---|---|
| committer | 2023-01-31 13:56:05 +0000 | |
| commit | c9446dc8af0be193ce90d5b8cfe3e44a3780a656 (patch) | |
| tree | 59c1a7d9fdf379780e17ce95c438ff0692b3d495 | |
| parent | 958993bfe087d4cc5a92ff7d531d27491b5dc418 (diff) | |
| parent | 1240bcec3da57ab79322d4b9450179b43478d044 (diff) | |
Merge "Protect broadcast for CHECK_MUSIC_ACTIVE" into tm-qpr-dev
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b10df606f334..31903e25f8fd 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 dfb24670b26b..c7c905e4066b 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) { |