summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/LockSettingsService.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-11-09 00:22:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-09 00:22:08 +0000
commited7376fc4829e93f5f2d3037633a37d652a13a7c (patch)
treedbca75c683d4e8910e4d14d80411f8fb445ac5f5 /services/java/com/android/server/LockSettingsService.java
parent105b9b05041ea6f1109d961d548f3dde2bd69501 (diff)
parent505329b21b743c6e74e0d1b14bea78a22f7b4145 (diff)
Merge "Restore permission check in keyguard." into klp-dev
Diffstat (limited to 'services/java/com/android/server/LockSettingsService.java')
-rw-r--r--services/java/com/android/server/LockSettingsService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/LockSettingsService.java b/services/java/com/android/server/LockSettingsService.java
index cd746cf44823..35e7afad301c 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) {