summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/AppOpsManager.java
diff options
context:
space:
mode:
authorBilly Lau <billylau@google.com>2015-07-16 00:04:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-16 00:04:35 +0000
commit008409a2ea1feed095d53ce51429e4fed964c50c (patch)
treec3a3b8fd0c47cd390e793dd0f99137462a577988 /core/java/android/app/AppOpsManager.java
parentf6586cbde7d4612963eb2e8a2413235630676b83 (diff)
parent060275ffc7fbfc72b19871f7dd7aefb61a81a1fc (diff)
downloadframeworks_base-008409a2ea1feed095d53ce51429e4fed964c50c.zip
frameworks_base-008409a2ea1feed095d53ce51429e4fed964c50c.tar.gz
frameworks_base-008409a2ea1feed095d53ce51429e4fed964c50c.tar.bz2
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
Diffstat (limited to 'core/java/android/app/AppOpsManager.java')
-rw-r--r--core/java/android/app/AppOpsManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 849253b..08e1696 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -773,7 +773,7 @@ public class AppOpsManager {
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED,
- AppOpsManager.MODE_ALLOWED,
+ AppOpsManager.MODE_DEFAULT, // OP_SYSTEM_ALERT_WINDOW
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED,