From 45775c4f93ccac604dcd5b027c8201872bbd0d46 Mon Sep 17 00:00:00 2001 From: Emily Bernier Date: Fri, 16 May 2014 15:12:04 -0400 Subject: [PATCH] Connect user audio restrictions to app ops. Setting DISALLOW_ADJUST_VOLUME sets the relevant app ops as well, blocking calls in AudioService. Change-Id: I256b294465fc2e8b93cb0389b21299eacf0efb95 --- core/java/android/app/AppOpsManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 62c4f0f0a464d..586723230ee4a 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -451,13 +451,13 @@ public class AppOpsManager { null, //WRITE_CLIPBOARD null, //TAKE_MEDIA_BUTTONS null, //TAKE_AUDIO_FOCUS - null, //AUDIO_MASTER_VOLUME - null, //AUDIO_VOICE_VOLUME - null, //AUDIO_RING_VOLUME - null, //AUDIO_MEDIA_VOLUME - null, //AUDIO_ALARM_VOLUME - null, //AUDIO_NOTIFICATION_VOLUME - null, //AUDIO_BLUETOOTH_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_MASTER_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_VOICE_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_RING_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_MEDIA_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_ALARM_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_NOTIFICATION_VOLUME + UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_BLUETOOTH_VOLUME null, //WAKE_LOCK null, //MONITOR_LOCATION null, //MONITOR_HIGH_POWER_LOCATION