Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev

This commit is contained in:
Fyodor Kupolov
2014-11-14 17:26:05 +00:00
committed by Android (Google) Code Review

View File

@@ -900,6 +900,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (DBG) Slog.d(LOG_TAG, "Handling package changes for user " + userHandle); if (DBG) Slog.d(LOG_TAG, "Handling package changes for user " + userHandle);
DevicePolicyData policy = getUserData(userHandle); DevicePolicyData policy = getUserData(userHandle);
IPackageManager pm = AppGlobals.getPackageManager(); IPackageManager pm = AppGlobals.getPackageManager();
synchronized (this) {
for (int i = policy.mAdminList.size() - 1; i >= 0; i--) { for (int i = policy.mAdminList.size() - 1; i >= 0; i--) {
ActiveAdmin aa = policy.mAdminList.get(i); ActiveAdmin aa = policy.mAdminList.get(i);
try { try {
@@ -919,6 +920,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
saveSettingsLocked(policy.mUserHandle); saveSettingsLocked(policy.mUserHandle);
} }
} }
}
/** /**
* Instantiates the service. * Instantiates the service.