diff options
| author | mark_chen <mark_chen@htc.com> | 2014-12-12 15:38:48 +0800 |
|---|---|---|
| committer | Mark Chen <mark_chen@htc.com> | 2014-12-16 05:44:34 +0000 |
| commit | 89764e337b6c11fb7ed919f563bcf1ceac92e364 (patch) | |
| tree | ea7610582e212ad6ee16d32681f52a643789f155 /core/java | |
| parent | 314621287801ba4c71467aad4702114eeb4d9951 (diff) | |
| download | frameworks_base-89764e337b6c11fb7ed919f563bcf1ceac92e364.zip frameworks_base-89764e337b6c11fb7ed919f563bcf1ceac92e364.tar.gz frameworks_base-89764e337b6c11fb7ed919f563bcf1ceac92e364.tar.bz2 | |
[ActivityManager] Use synchronized to protect object
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object
Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 17a31f3..6233676 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -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, |