From 7781ef68703995c6724eb618c8c0c3eb10cb2a73 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Sat, 4 Apr 2015 17:48:18 -0700
Subject: [PATCH] Update with new assist app ops.

Change-Id: I796845dd1cb3ccfe951e0cbdb7cab55ec476f128
---
 res/values/arrays.xml                                  | 6 ++++++
 src/com/android/settings/applications/AppOpsState.java | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a0afbc33604..22c351c69aa 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -618,6 +618,9 @@
         <item>mute/unmute microphone</item>
         <item>project media</item>
         <item>activate VPN</item>
+        <item>write wallpaper</item>
+        <item>assist structure</item>
+        <item>assist screenshot</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -669,6 +672,9 @@
         <item>Mute/unmute microphone</item>
         <item>Project media</item>
         <item>Activate VPN</item>
+        <item>Write wallpaper</item>
+        <item>Assist structure</item>
+        <item>Assist screenshot</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 1ab3c7344e0..77c4582cf56 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[] {