diff options
| author | Michael Wright <michaelwr@google.com> | 2014-07-08 18:54:55 -0700 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2014-07-16 00:04:19 +0000 |
| commit | bdf28e40251772a35f776af9fd1a4b903f0f9771 (patch) | |
| tree | 3398f6c0b4fc03fb935d0a9a9c7ece27fa1bdfec | |
| parent | 62a8aa7ac90ad28e8f524011480b8b379d0bb50a (diff) | |
| download | packages_apps_Settings-bdf28e40251772a35f776af9fd1a4b903f0f9771.zip packages_apps_Settings-bdf28e40251772a35f776af9fd1a4b903f0f9771.tar.gz packages_apps_Settings-bdf28e40251772a35f776af9fd1a4b903f0f9771.tar.bz2 | |
Add OP_PROJECT_MEDIA to AppOps
Bug: 9905068
Change-Id: Ie929cfbe0001f6e6645316ea8b2eca13aab35675
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | src/com/android/settings/applications/AppOpsState.java | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index a00fbb4..3911378 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -641,10 +641,12 @@ <item>alarm volume</item> <item>notification volume</item> <item>bluetooth volume</item> - <item>mute/unmute microphone</item> <item>keep awake</item> <item>monitor location</item> <item>monitor high power location</item> + <item>get usage stats</item> + <item>mute/unmute microphone</item> + <item>project media</item> </string-array> <!-- User display names for app ops codes --> @@ -689,10 +691,12 @@ <item>Alarm volume</item> <item>Notification volume</item> <item>Bluetooth volume</item> - <item>Mute/unmute microphone</item> <item>Keep awake</item> <item>Location</item> <item>Location</item> + <item>Get usage stats</item> + <item>Mute/unmute microphone</item> + <item>Project media</item> </string-array> <!-- Titles for the list of long press timeout options. --> diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java index 4ef5ef2..75a8372 100644 --- a/src/com/android/settings/applications/AppOpsState.java +++ b/src/com/android/settings/applications/AppOpsState.java @@ -103,14 +103,14 @@ public class AppOpsState { AppOpsManager.OP_WIFI_SCAN, AppOpsManager.OP_NEIGHBORING_CELLS, AppOpsManager.OP_MONITOR_LOCATION, - AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION}, + AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION }, new boolean[] { true, true, false, false, false, false, - false} + false } ); public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate( @@ -189,13 +189,15 @@ public class AppOpsState { AppOpsManager.OP_CALL_PHONE, AppOpsManager.OP_WRITE_SETTINGS, AppOpsManager.OP_SYSTEM_ALERT_WINDOW, - AppOpsManager.OP_WAKE_LOCK }, + AppOpsManager.OP_WAKE_LOCK, + AppOpsManager.OP_PROJECT_MEDIA }, new boolean[] { false, true, true, true, true, - true, } + true, + false, } ); public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] { |