diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-09-02 17:48:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 17:48:28 +0000 |
| commit | 38ae119688f94d68c42d8d29958038e37bb74915 (patch) | |
| tree | 013863aebef76afcb8fe67146a1411451d136c77 /packages/Shell | |
| parent | 01232c508e3d28c9c4cac08778c9d80d8d2395de (diff) | |
| parent | 7cd6aaafda35509607e945fcadc4a556f75ed23b (diff) | |
| download | frameworks_base-38ae119688f94d68c42d8d29958038e37bb74915.zip frameworks_base-38ae119688f94d68c42d8d29958038e37bb74915.tar.gz frameworks_base-38ae119688f94d68c42d8d29958038e37bb74915.tar.bz2 | |
am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit '7cd6aaafda35509607e945fcadc4a556f75ed23b':
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" /> |