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

This commit is contained in:
Jim Miller
2016-04-15 21:03:15 +00:00
committed by Android (Google) Code Review

View File

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