diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-04-06 20:21:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-06 20:21:55 +0000 |
| commit | bec3e0114371dc2cfc36e7b1ae0f7bcfe57ae310 (patch) | |
| tree | ca3bb21bb5bb80463866f35043c4ffd5bb631df8 /src/com/android/settings | |
| parent | 4e0fc628f0e53b3f77ea5474f7a273d7af61da4d (diff) | |
| parent | 7781ef68703995c6724eb618c8c0c3eb10cb2a73 (diff) | |
| download | packages_apps_Settings-bec3e0114371dc2cfc36e7b1ae0f7bcfe57ae310.tar.gz packages_apps_Settings-bec3e0114371dc2cfc36e7b1ae0f7bcfe57ae310.tar.bz2 packages_apps_Settings-bec3e0114371dc2cfc36e7b1ae0f7bcfe57ae310.zip | |
Merge "Update with new assist app ops."
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/applications/AppOpsState.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java index 1ab3c7344..77c4582cf 100644 --- a/src/com/android/settings/applications/AppOpsState.java +++ b/src/com/android/settings/applications/AppOpsState.java @@ -191,7 +191,9 @@ public class AppOpsState { AppOpsManager.OP_SYSTEM_ALERT_WINDOW, AppOpsManager.OP_WAKE_LOCK, AppOpsManager.OP_PROJECT_MEDIA, - AppOpsManager.OP_ACTIVATE_VPN, }, + AppOpsManager.OP_ACTIVATE_VPN, + AppOpsManager.OP_ASSIST_STRUCTURE, + AppOpsManager.OP_ASSIST_SCREENSHOT}, new boolean[] { false, true, true, @@ -199,7 +201,9 @@ public class AppOpsState { true, true, false, - false, } + false, + false, + false } ); public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] { |