summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/applications
diff options
context:
space:
mode:
authorDavid Christie <dnchrist@google.com>2013-08-01 19:26:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-01 19:26:08 +0000
commit34605e1dcf4ac61109911836e7bba864f62080d6 (patch)
treeca6d2b8652a316505c4dda94a9a6dca46619e876 /src/com/android/settings/applications
parente990420f52ae7832cbf7bc6ad4f96b6c7a8244c8 (diff)
parent4a06e4cc4370f5897f07f6314f25b37db759cf18 (diff)
downloadpackages_apps_Settings-34605e1dcf4ac61109911836e7bba864f62080d6.zip
packages_apps_Settings-34605e1dcf4ac61109911836e7bba864f62080d6.tar.gz
packages_apps_Settings-34605e1dcf4ac61109911836e7bba864f62080d6.tar.bz2
Merge "Add Strings for the new high power location monitoring app op."
Diffstat (limited to 'src/com/android/settings/applications')
-rw-r--r--src/com/android/settings/applications/AppOpsState.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 61ed2f4..9243b0e 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/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(