Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev (6dd9f86f) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+17 −15

Original line number	Original line	Diff line number	Diff line
	@@ -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.