Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 45c77d951a

* commit '45c77d951ab5203b8e19c2ed2ce3a0816e42b118':
  Fix missing permission check when saving pattern/password

Change-Id: I81947e95d5365bbf6a4927435f43c73dc4ac2bb0
This commit is contained in:
Jim Miller
2016-05-24 22:08:16 +00:00
committed by android-build-merger
parent 0f59d9b80c 45c77d951a
commit 9bf8474c27
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -424,6 +424,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) {
@@ -452,6 +453,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) {