diff options
| author | 2013-07-26 21:06:18 +0000 | |
|---|---|---|
| committer | 2013-07-26 21:06:18 +0000 | |
| commit | c82bcca5510a3d21113e7fbab16bbfe4d124e934 (patch) | |
| tree | 82aac1191a5dbe9ae6200a9367f2fd0aefa26326 | |
| parent | 9f213c8b648c06e781911c12d6c12f6a6606f6d2 (diff) | |
| parent | a92ce1f32d87e2894586ed089a7e6090642993fe (diff) | |
Merge "Keyguard doesn't need new MANAGE_DEVICE_ADMINS permission"
| -rw-r--r-- | packages/Keyguard/AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/Keyguard/AndroidManifest.xml b/packages/Keyguard/AndroidManifest.xml index 7039d6d27d52..7d77c48b5636 100644 --- a/packages/Keyguard/AndroidManifest.xml +++ b/packages/Keyguard/AndroidManifest.xml @@ -35,7 +35,6 @@ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.BIND_APPWIDGET" /> <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" /> - <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" /> <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" /> |