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

Commit 3be9a0c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prefer constant than hardcoded permission string" into main

parents b93db66f 89edc8b8

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -19471,7 +19471,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    /**

     * @hide

     */

    @EnforcePermission("android.permission.INTERACT_ACROSS_USERS_FULL")

    @EnforcePermission(INTERACT_ACROSS_USERS_FULL)

    public IBinder refreshIntentCreatorToken(Intent intent) {

        refreshIntentCreatorToken_enforcePermission();

        IBinder binder = intent.getCreatorToken();

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

+3 −3
Original line number Diff line number Diff line
@@ -11407,7 +11407,7 @@ public class AudioService extends IAudioService.Stub 














    /** see {@link AudioManager#getFocusDuckedUidsForTest()} */















    @Override













    @EnforcePermission("android.permission.QUERY_AUDIO_STATE")













    @EnforcePermission(QUERY_AUDIO_STATE)















    public @NonNull List<Integer> getFocusDuckedUidsForTest() {















        super.getFocusDuckedUidsForTest_enforcePermission();















        return mPlaybackMonitor.getFocusDuckedUids();









@@ -11434,7 +11434,7 @@ public class AudioService extends IAudioService.Stub













     * @see AudioManager#getFocusFadeOutDurationForTest()















     * @return the fade out duration, in ms















     */













    @EnforcePermission("android.permission.QUERY_AUDIO_STATE")













    @EnforcePermission(QUERY_AUDIO_STATE)















    public long getFocusFadeOutDurationForTest() {















        super.getFocusFadeOutDurationForTest_enforcePermission();















        return mMediaFocusControl.getFocusFadeOutDurationForTest();









@@ -11447,7 +11447,7 @@ public class AudioService extends IAudioService.Stub













     * @return the time gap after a fade out completion on focus loss, and fade in start, in ms















     */















    @Override













    @EnforcePermission("android.permission.QUERY_AUDIO_STATE")













    @EnforcePermission(QUERY_AUDIO_STATE)















    public long getFocusUnmuteDelayAfterFadeOutForTest() {















        super.getFocusUnmuteDelayAfterFadeOutForTest_enforcePermission();















        return mMediaFocusControl.getFocusUnmuteDelayAfterFadeOutForTest();