commit b8a90e5042c0b112a44d7619fd2928bb92a4a6dc
author Michael Wright <michaelwr@google.com> Thu Jul 17 21:59:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 21:04:20 2014 +0000
tree 148cb0d7e774ef657d56f1c86307996745ad8384
parent eb0628bb02e5945acc0b5fe9da7082b279f043d6
parent bdf28e40251772a35f776af9fd1a4b903f0f9771

Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev

res/values/arrays.xml

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. -->

src/com/android/settings/applications/AppOpsState.java

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 @@
                     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 @@
                     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[] {