summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2015-09-01 14:21:09 -0700
committerThe Android Automerger <android-build@google.com>2015-09-02 14:05:05 -0700
commit7d087fe8176ebc25dff49ce940b3d1b683452667 (patch)
treeb2e9e4c8fe3961318168f3dd7c981a3befa9c17d /packages/Shell
parentd1dcd548b1cdaad2acae0b09e42a229eedd59989 (diff)
downloadframeworks_base-7d087fe8176ebc25dff49ce940b3d1b683452667.zip
frameworks_base-7d087fe8176ebc25dff49ce940b3d1b683452667.tar.gz
frameworks_base-7d087fe8176ebc25dff49ce940b3d1b683452667.tar.bz2
Allow shell to disable keyguard when not secure
Bug: 22694837 Change-Id: I0f08048f617d064017468f331a5c6875ab27174b
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" />