Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update AudioService to use manifest constants for @EnforcePermission" into udc-dev

Browse Source
This commit is contained in:
Cole Faust
2023-03-09 22:39:26 +00:00
committed by Android (Google) Code Review
parent a8df8fa1d2 c07b591e17
commit e4e7e14c81
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -3928,8 +3928,10 @@ public class AudioService extends IAudioService.Stub
} }
@Override @Override
@android.annotation.EnforcePermission(anyOf = @android.annotation.EnforcePermission(anyOf = {
{"MODIFY_AUDIO_ROUTING", "MODIFY_AUDIO_SETTINGS_PRIVILEGED"}) android.Manifest.permission.MODIFY_AUDIO_ROUTING,
android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED
})
/** @see AudioDeviceVolumeManager#setDeviceVolume(VolumeInfo, AudioDeviceAttributes) /** @see AudioDeviceVolumeManager#setDeviceVolume(VolumeInfo, AudioDeviceAttributes)
* Part of service interface, check permissions and parameters here * Part of service interface, check permissions and parameters here
* Note calling package is for logging purposes only, not to be trusted * Note calling package is for logging purposes only, not to be trusted
@@ -4945,8 +4947,10 @@ public class AudioService extends IAudioService.Stub
} }
@Override @Override
@android.annotation.EnforcePermission(anyOf = @android.annotation.EnforcePermission(anyOf = {
{"MODIFY_AUDIO_ROUTING", "MODIFY_AUDIO_SETTINGS_PRIVILEGED"}) android.Manifest.permission.MODIFY_AUDIO_ROUTING,
android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED
})
/** /**
* @see AudioDeviceVolumeManager#getDeviceVolume(VolumeInfo, AudioDeviceAttributes) * @see AudioDeviceVolumeManager#getDeviceVolume(VolumeInfo, AudioDeviceAttributes)
*/ */
@@ -7214,8 +7218,10 @@ public class AudioService extends IAudioService.Stub
* @param device the audio device to be affected * @param device the audio device to be affected
* @param deviceVolumeBehavior one of the device behaviors * @param deviceVolumeBehavior one of the device behaviors
*/ */
@android.annotation.EnforcePermission(anyOf = @android.annotation.EnforcePermission(anyOf = {
{"MODIFY_AUDIO_ROUTING", "MODIFY_AUDIO_SETTINGS_PRIVILEGED"}) android.Manifest.permission.MODIFY_AUDIO_ROUTING,
android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED
})
public void setDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device, public void setDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device,
@AudioManager.DeviceVolumeBehavior int deviceVolumeBehavior, @Nullable String pkgName) { @AudioManager.DeviceVolumeBehavior int deviceVolumeBehavior, @Nullable String pkgName) {
// verify permissions // verify permissions
@@ -7295,8 +7301,11 @@ public class AudioService extends IAudioService.Stub
* @param device the audio output device type * @param device the audio output device type
* @return the volume behavior for the device * @return the volume behavior for the device
*/ */
@android.annotation.EnforcePermission(anyOf = @android.annotation.EnforcePermission(anyOf = {
{"MODIFY_AUDIO_ROUTING", "QUERY_AUDIO_STATE", "MODIFY_AUDIO_SETTINGS_PRIVILEGED"}) android.Manifest.permission.MODIFY_AUDIO_ROUTING,
android.Manifest.permission.QUERY_AUDIO_STATE,
android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED
})
public @AudioManager.DeviceVolumeBehavior public @AudioManager.DeviceVolumeBehavior
int getDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device) { int getDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device) {
// verify permissions // verify permissions