Merge "Update with new assist app ops."

2015-04-06 20:21:54 +00:00
parent 4e0fc628f0 7781ef6870
commit bec3e01143
2 changed files with 12 additions and 2 deletions
--- 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[] {