diff options
| author | 2025-02-24 16:31:15 -0800 | |
|---|---|---|
| committer | 2025-02-24 16:31:15 -0800 | |
| commit | 3be9a0c618f59eee8fe6aa0cf53b28346ea43804 (patch) | |
| tree | 385a54eed9a258e69d0ddeff93d00eaa042d246e | |
| parent | b93db66f251f941a38f161b63b2c9dc03a2b9750 (diff) | |
| parent | 89edc8b8fda99479d459975c2a7ac2e41a0d4293 (diff) | |
Merge "Prefer constant than hardcoded permission string" into main
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 8b701f0e2069..b0b34d0ab9c4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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(); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index c644597287d4..0f1228f44b0d 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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(); |