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

am: 89e3f2ba98

* commit '89e3f2ba98ea6d69b1846e996c4c279a9b20c4e9':
  Fix missing permission check when saving pattern/password

Change-Id: Ice157c9ee86cf29380766d3ec266cb57594a5868
This commit is contained in:
Jim Miller
2016-05-24 22:20:09 +00:00
committed by android-build-merger

View File

@@ -428,6 +428,7 @@ public class LockSettingsService extends ILockSettings.Stub {
@Override @Override
public void setLockPattern(String pattern, String savedCredential, int userId) public void setLockPattern(String pattern, String savedCredential, int userId)
throws RemoteException { throws RemoteException {
checkWritePermission(userId);
byte[] currentHandle = getCurrentHandle(userId); byte[] currentHandle = getCurrentHandle(userId);
if (pattern == null) { if (pattern == null) {
@@ -456,6 +457,7 @@ public class LockSettingsService extends ILockSettings.Stub {
@Override @Override
public void setLockPassword(String password, String savedCredential, int userId) public void setLockPassword(String password, String savedCredential, int userId)
throws RemoteException { throws RemoteException {
checkWritePermission(userId);
byte[] currentHandle = getCurrentHandle(userId); byte[] currentHandle = getCurrentHandle(userId);
if (password == null) { if (password == null) {