Merge "Add Strings for the new high power location monitoring app op."

res/values/arrays.xml

@@ -572,7 +572,7 @@
         <item>gid</item>
     </string-array>
 
-    <!-- Apps on SD instalaltion location options in ApplicationSettings -->
+    <!-- Apps on SD installation location options in ApplicationSettings -->
     <string-array name="app_install_location_entries">
         <item>Internal device storage</item>
         <item>Removable SD card</item>
@@ -639,6 +639,7 @@
         <item>bluetooth volume</item>
         <item>keep awake</item>
         <item>monitor location</item>
+        <item>monitor high power location</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -685,6 +686,7 @@
         <item>Bluetooth volume</item>
         <item>Keep awake</item>
         <item>Location</item>
+        <item>Location</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->

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

@@ -102,13 +102,15 @@ public class AppOpsState {
                     AppOpsManager.OP_GPS,
                     AppOpsManager.OP_WIFI_SCAN,
                     AppOpsManager.OP_NEIGHBORING_CELLS,
-                    AppOpsManager.OP_MONITOR_LOCATION },
+                    AppOpsManager.OP_MONITOR_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(