diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-09-02 17:28:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-02 17:28:08 +0000 |
| commit | ee72f99dd14c8e531cd1a114d162a49636e7b809 (patch) | |
| tree | 37ad8968f1a688b93838746e58f1d1e245fd550f /packages/Shell | |
| parent | f7b220ab9f62be3d279e3fa7923c249ff0fa09f3 (diff) | |
| parent | bba73a038e8d01f01bdc4ac0d61916af9efe7380 (diff) | |
| download | frameworks_base-ee72f99dd14c8e531cd1a114d162a49636e7b809.zip frameworks_base-ee72f99dd14c8e531cd1a114d162a49636e7b809.tar.gz frameworks_base-ee72f99dd14c8e531cd1a114d162a49636e7b809.tar.bz2 | |
Merge "Allow shell to disable keyguard when not secure" into mnc-dev
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" /> |