commit 9bf8474c27642f48aa27e2edf1bdd83b27d692c1
author Jim Miller <jaggies@google.com> Tue May 24 22:08:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 22:08:16 2016 +0000
tree b3ac864d0de7af5181a8858cffa6d69706695a6f
parent 0f59d9b80c9f5daa321b683525ba8732add007c2
parent 45c77d951ab5203b8e19c2ed2ce3a0816e42b118

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

* commit '45c77d951ab5203b8e19c2ed2ce3a0816e42b118':
  Fix missing permission check when saving pattern/password

Change-Id: I81947e95d5365bbf6a4927435f43c73dc4ac2bb0

services/core/java/com/android/server/LockSettingsService.java

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index f1d7da4..55682c2 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -424,6 +424,7 @@
     @Override
     public void setLockPattern(String pattern, String savedCredential, int userId)
             throws RemoteException {
+        checkWritePermission(userId);
         byte[] currentHandle = getCurrentHandle(userId);
 
         if (pattern == null) {
@@ -452,6 +453,7 @@
     @Override
     public void setLockPassword(String password, String savedCredential, int userId)
             throws RemoteException {
+        checkWritePermission(userId);
         byte[] currentHandle = getCurrentHandle(userId);
 
         if (password == null) {