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

Merge "Only unbind agents of the user that is being refreshed" into lmp-dev

Browse Source
This commit is contained in:
Adrian Roos
2014-09-10 11:24:07 +00:00
committed by Android (Google) Code Review
parent f950641e28 e681c27dc6
commit c727fb1fc2
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,6 +164,11 @@ public class TrustManagerService extends SystemService {
void refreshAgentList(int userId) {
if (DEBUG) Slog.d(TAG, "refreshAgentList()");
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) {
Log.e(TAG, "refreshAgentList(userId=" + userId + "): Invalid user handle,"
+ " must be USER_ALL or a specific user.", new Throwable("here"));
userId = UserHandle.USER_ALL;
}
PackageManager pm = mContext.getPackageManager();
List<UserInfo> userInfos;
@@ -223,11 +228,13 @@ public class TrustManagerService extends SystemService {
boolean trustMayHaveChanged = false;
for (int i = 0; i < obsoleteAgents.size(); i++) {
AgentInfo info = obsoleteAgents.valueAt(i);
if (info.agent.isManagingTrust()) {
trustMayHaveChanged = true;
if (userId == UserHandle.USER_ALL || userId == info.userId) {
if (info.agent.isManagingTrust()) {
trustMayHaveChanged = true;
}
info.agent.unbind();
mActiveAgents.remove(info);
}
info.agent.unbind();
mActiveAgents.remove(info);
}
if (trustMayHaveChanged) {