Merge "Less intrusive VPN dialog." into lmp-dev

2014-08-20 23:59:30 +00:00
parent e847e7ef56 90b3b211ef
commit 4e064343b3
3 changed files with 7 additions and 11 deletions
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -190,13 +190,15 @@ public class AppOpsState {
                    AppOpsManager.OP_WRITE_SETTINGS,
                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
                    AppOpsManager.OP_WAKE_LOCK,
-                    AppOpsManager.OP_PROJECT_MEDIA },
+                    AppOpsManager.OP_PROJECT_MEDIA,
+                    AppOpsManager.OP_ACTIVATE_VPN, },
            new boolean[] { false,
                    true,
                    true,
                    true,
                    true,
                    true,
+                    false,
                    false, }
            );