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

Commit 275c94ae authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix missing permission check when saving pattern/password" into nyc-dev

parents a6f12cf3 e484eaff

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);