Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89e3f2ba authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

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

am: 9bf8474c

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

Change-Id: I4238a43dc30be54375b6db129b360cc7d0a90b0e
parents 08a48081 9bf8474c

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

+2 −0
Original line number Diff line number Diff line
@@ -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) {