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

Commit c9446dc8 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Protect broadcast for CHECK_MUSIC_ACTIVE" into tm-qpr-dev

parents 958993bf 1240bcec

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

services/core/java/com/android/server/audio/AudioService.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {