diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-09 00:22:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-09 00:22:08 +0000 |
| commit | ed7376fc4829e93f5f2d3037633a37d652a13a7c (patch) | |
| tree | dbca75c683d4e8910e4d14d80411f8fb445ac5f5 | |
| parent | 105b9b05041ea6f1109d961d548f3dde2bd69501 (diff) | |
| parent | 505329b21b743c6e74e0d1b14bea78a22f7b4145 (diff) | |
| download | frameworks_base-ed7376fc4829e93f5f2d3037633a37d652a13a7c.zip frameworks_base-ed7376fc4829e93f5f2d3037633a37d652a13a7c.tar.gz frameworks_base-ed7376fc4829e93f5f2d3037633a37d652a13a7c.tar.bz2 | |
Merge "Restore permission check in keyguard." into klp-dev
| -rw-r--r-- | packages/Keyguard/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/LockSettingsService.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/Keyguard/AndroidManifest.xml b/packages/Keyguard/AndroidManifest.xml index 9e296e2..66d1e75 100644 --- a/packages/Keyguard/AndroidManifest.xml +++ b/packages/Keyguard/AndroidManifest.xml @@ -38,6 +38,7 @@ <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" /> <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" /> <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" /> + <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> <application android:label="@string/app_name" android:process="com.android.systemui" diff --git a/services/java/com/android/server/LockSettingsService.java b/services/java/com/android/server/LockSettingsService.java index cd746cf..35e7afa 100644 --- a/services/java/com/android/server/LockSettingsService.java +++ b/services/java/com/android/server/LockSettingsService.java @@ -154,11 +154,11 @@ public class LockSettingsService extends ILockSettings.Stub { } private final void checkWritePermission(int userId) { - mContext.checkCallingOrSelfPermission(PERMISSION); + mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsWrite"); } private final void checkPasswordReadPermission(int userId) { - mContext.checkCallingOrSelfPermission(PERMISSION); + mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsRead"); } private final void checkReadPermission(String requestedKey, int userId) { |