summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2015-09-02 17:40:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-02 17:40:36 +0000
commit7cd6aaafda35509607e945fcadc4a556f75ed23b (patch)
treefa18f7ae813f3c706aee47286f7b9f2f6ce11307 /packages/Shell
parent582b186cd3b41c5c67649ae2ba9176c3860ab1ec (diff)
parentee72f99dd14c8e531cd1a114d162a49636e7b809 (diff)
downloadframeworks_base-7cd6aaafda35509607e945fcadc4a556f75ed23b.zip
frameworks_base-7cd6aaafda35509607e945fcadc4a556f75ed23b.tar.gz
frameworks_base-7cd6aaafda35509607e945fcadc4a556f75ed23b.tar.bz2
am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit 'ee72f99dd14c8e531cd1a114d162a49636e7b809': Allow shell to disable keyguard when not secure
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index d785cca..b9daf59 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -39,6 +39,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<!-- System tool permissions granted to the shell. -->
<uses-permission android:name="android.permission.REAL_GET_TASKS" />
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />