summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2018-02-22 12:36:55 -0800
committer Wale Ogunwale <ogunwale@google.com> 2018-02-22 12:36:55 -0800
commit3d088810c99b33debbda3fae90eea82bdb339121 (patch)
tree86dc319fb08359661423ff3ef1bf9cb5a1b20a3f
parent93d7d0e56ed6ea3ff5a6a5d4c60bc5060cbee24f (diff)
Give shell CONTROL_KEYGUARD permission.
Follow-up to ag/3614843 where we started to enforce the permission in window manager. Bug: 67109817 Test: builds Change-Id: Id5712d2ed4c537da3a443f9c51aa15e3c84d670b
-rw-r--r--packages/Shell/AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index d919d6ac9d2c..d284bf9076e1 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -145,6 +145,8 @@
android:name="android.permission.MANAGE_WIFI_WHEN_PERMISSION_REVIEW_REQUIRED" />
<uses-permission android:name="android.permission.WATCH_APPOPS" />
+ <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
+
<application android:label="@string/app_label"
android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true">