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

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

Merge "Protect broadcast for CHECK_MUSIC_ACTIVE"

parents 2258d2bf 84c77b43

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/SoundDoseHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class SoundDoseHelper { 
    private static final String TAG = "AS.SoundDoseHelper";



    /*package*/ static final String ACTION_CHECK_MUSIC_ACTIVE =

            AudioService.class.getSimpleName() + ".CHECK_MUSIC_ACTIVE";

            "com.android.server.audio.action.CHECK_MUSIC_ACTIVE";



    /** Flag to enable/disable the sound dose computation. */

    private static final boolean USE_CSD_FOR_SAFE_HEARING = false;