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

Commit 9031fac2 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 nyc-dev 

am: 275c94ae

* commit '275c94ae':
  Fix missing permission check when saving pattern/password

Change-Id: I2d0ea07f104d292fe9506ed3b718605ab92caf00
parents 6431276d 275c94ae

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

+2 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
    @Override

    public void setLockPattern(String pattern, String savedCredential, int userId)

            throws RemoteException {

        checkWritePermission(userId);

        synchronized (mSeparateChallengeLock) {

            setLockPatternInternal(pattern, savedCredential, userId);

            setSeparateProfileChallengeEnabled(userId, true, null);
@@ -871,6 +872,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
    @Override

    public void setLockPassword(String password, String savedCredential, int userId)

            throws RemoteException {

        checkWritePermission(userId);

        synchronized (mSeparateChallengeLock) {

            setLockPasswordInternal(password, savedCredential, userId);

            setSeparateProfileChallengeEnabled(userId, true, null);