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

Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev

Browse Source
This commit is contained in:
Jim Miller
2012-09-21 17:31:08 -07:00
committed by Android (Google) Code Review
parent 0a5c5567f2 25645d8bbc
commit 6eeff850b2
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -215,36 +215,26 @@ public class LockPatternUtils {
} }
public void setCurrentUser(int userId) { public void setCurrentUser(int userId) {
if (Process.myUid() == Process.SYSTEM_UID) { mCurrentUserId = userId;
mCurrentUserId = userId;
} else {
throw new SecurityException("Only the system process can set the current user");
}
} }
public int getCurrentUser() { public int getCurrentUser() {
if (Process.myUid() == Process.SYSTEM_UID) { if (mCurrentUserId != UserHandle.USER_NULL) {
if (mCurrentUserId != UserHandle.USER_NULL) { // Someone is regularly updating using setCurrentUser() use that value.
// Someone is regularly updating using setCurrentUser() use that value. return mCurrentUserId;
return mCurrentUserId; }
} try {
try { return ActivityManagerNative.getDefault().getCurrentUser().id;
return ActivityManagerNative.getDefault().getCurrentUser().id; } catch (RemoteException re) {
} catch (RemoteException re) { return UserHandle.USER_OWNER;
return UserHandle.USER_OWNER;
}
} else {
throw new SecurityException("Only the system process can get the current user");
} }
} }
public void removeUser(int userId) { public void removeUser(int userId) {
if (Process.myUid() == Process.SYSTEM_UID) { try {
try { getLockSettings().removeUser(userId);
getLockSettings().removeUser(userId); } catch (RemoteException re) {
} catch (RemoteException re) { Log.e(TAG, "Couldn't remove lock settings for user " + userId);
Log.e(TAG, "Couldn't remove lock settings for user " + userId);
}
} }
} }
@@ -591,10 +581,6 @@ public class LockPatternUtils {
// Compute the hash // Compute the hash
final byte[] hash = passwordToHash(password); final byte[] hash = passwordToHash(password);
try { try {
if (Process.myUid() != Process.SYSTEM_UID && userHandle != UserHandle.myUserId()) {
throw new SecurityException(
"Only the system process can save lock password for another user");
}
getLockSettings().setLockPassword(hash, userHandle); getLockSettings().setLockPassword(hash, userHandle);
DevicePolicyManager dpm = getDevicePolicyManager(); DevicePolicyManager dpm = getDevicePolicyManager();
KeyStore keyStore = KeyStore.getInstance(); KeyStore keyStore = KeyStore.getInstance();