am 486a9942: Merge "[ActivityManager] Use synchronized to protect object"

* commit '486a9942ebc6e3efe04004afd759a53ab96517ec':
  [ActivityManager] Use synchronized to protect object
This commit is contained in:
Olawale Ogunwale
2014-12-17 21:47:38 +00:00
committed by Android Git Automerger

View File

@@ -4161,22 +4161,24 @@ public final class ActivityThread {
final void handleDispatchPackageBroadcast(int cmd, String[] packages) {
boolean hasPkgInfo = false;
if (packages != null) {
for (int i=packages.length-1; i>=0; i--) {
//Slog.i(TAG, "Cleaning old package: " + packages[i]);
if (!hasPkgInfo) {
WeakReference<LoadedApk> ref;
ref = mPackages.get(packages[i]);
if (ref != null && ref.get() != null) {
hasPkgInfo = true;
} else {
ref = mResourcePackages.get(packages[i]);
synchronized (mResourcesManager) {
for (int i=packages.length-1; i>=0; i--) {
//Slog.i(TAG, "Cleaning old package: " + packages[i]);
if (!hasPkgInfo) {
WeakReference<LoadedApk> ref;
ref = mPackages.get(packages[i]);
if (ref != null && ref.get() != null) {
hasPkgInfo = true;
} else {
ref = mResourcePackages.get(packages[i]);
if (ref != null && ref.get() != null) {
hasPkgInfo = true;
}
}
}
mPackages.remove(packages[i]);
mResourcePackages.remove(packages[i]);
}
mPackages.remove(packages[i]);
mResourcePackages.remove(packages[i]);
}
}
ApplicationPackageManager.handlePackageBroadcast(cmd, packages,