diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-09-02 17:59:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 17:59:51 +0000 |
| commit | 573cdc420b2d7f8d4636a949458a59f1937d62d1 (patch) | |
| tree | 4155f606da60e6c9107d54e5f525826866708b11 /packages/Shell | |
| parent | 9b126882e61f2a1c3b0d1876c2bea3b38bbbafed (diff) | |
| parent | 38ae119688f94d68c42d8d29958038e37bb74915 (diff) | |
| download | frameworks_base-573cdc420b2d7f8d4636a949458a59f1937d62d1.zip frameworks_base-573cdc420b2d7f8d4636a949458a59f1937d62d1.tar.gz frameworks_base-573cdc420b2d7f8d4636a949458a59f1937d62d1.tar.bz2 | |
am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit '38ae119688f94d68c42d8d29958038e37bb74915':
Allow shell to disable keyguard when not secure
Diffstat (limited to 'packages/Shell')
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
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" /> |