Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a

am: 9bf8474c27

* commit '9bf8474c27642f48aa27e2edf1bdd83b27d692c1':
  Fix missing permission check when saving pattern/password

Change-Id: I4238a43dc30be54375b6db129b360cc7d0a90b0e

1 files changed, 2 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index 45e7b5eb83d5..f1678d26e119 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -428,6 +428,7 @@ public class LockSettingsService extends ILockSettings.Stub {
     @Override
     public void setLockPattern(String pattern, String savedCredential, int userId)
             throws RemoteException {
+        checkWritePermission(userId);
         byte[] currentHandle = getCurrentHandle(userId);
 
         if (pattern == null) {
@@ -456,6 +457,7 @@ public class LockSettingsService extends ILockSettings.Stub {
     @Override
     public void setLockPassword(String password, String savedCredential, int userId)
             throws RemoteException {
+        checkWritePermission(userId);
         byte[] currentHandle = getCurrentHandle(userId);
 
         if (password == null) {