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

Clean up USER_OWNER in TrustManagerService

Browse Source 
Bug: 19913735
Change-Id: I4d0ce3d7f68772faed166818978156c663cebdc9
This commit is contained in:
Xiaohui Chen
2015-08-05 09:44:56 -07:00
parent 3526534a06
commit 09e02917ff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -122,7 +122,7 @@ public class TrustManagerService extends SystemService {
private final SparseBooleanArray mUserHasAuthenticatedSinceBoot = new SparseBooleanArray();
private boolean mTrustAgentsCanRun = false;
private int mCurrentUser = UserHandle.USER_OWNER;
private int mCurrentUser = UserHandle.USER_SYSTEM;
public TrustManagerService(Context context) {
super(context);
@@ -150,7 +150,7 @@ public class TrustManagerService extends SystemService {
mTrustAgentsCanRun = true;
refreshAgentList(UserHandle.USER_ALL);
} else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
maybeEnableFactoryTrustAgents(mLockPatternUtils, UserHandle.USER_OWNER);
maybeEnableFactoryTrustAgents(mLockPatternUtils, UserHandle.USER_SYSTEM);
}
}
@@ -205,7 +205,7 @@ public class TrustManagerService extends SystemService {
if (!mTrustAgentsCanRun) {
return;
}
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) {
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_SYSTEM) {
Log.e(TAG, "refreshAgentList(userId=" + userId + "): Invalid user handle,"
+ " must be USER_ALL or a specific user.", new Throwable("here"));
userId = UserHandle.USER_ALL;
@@ -296,7 +296,7 @@ public class TrustManagerService extends SystemService {
}
private void refreshDeviceLockedForUser(int userId) {
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) {
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_SYSTEM) {
Log.e(TAG, "refreshDeviceLockedForUser(userId=" + userId + "): Invalid user handle,"
+ " must be USER_ALL or a specific user.", new Throwable("here"));
userId = UserHandle.USER_ALL;
@@ -683,7 +683,7 @@ public class TrustManagerService extends SystemService {
@Override
public void reportRequireCredentialEntry(int userId) throws RemoteException {
enforceReportPermission();
if (userId == UserHandle.USER_ALL || userId >= UserHandle.USER_OWNER) {
if (userId == UserHandle.USER_ALL || userId >= UserHandle.USER_SYSTEM) {
mHandler.obtainMessage(MSG_REQUIRE_CREDENTIAL_ENTRY, userId, 0).sendToTarget();
} else {
throw new IllegalArgumentException(