Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"

2010-07-22 15:55:31 -07:00
parent e7486695ce 61f07659fe
commit dd29904638
1 changed files with 6 additions and 4 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -5880,10 +5880,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                String[] pkgs = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
                if (pkgs != null) {
                    for (String pkg : pkgs) {
-                        if (forceStopPackageLocked(pkg, -1, false, false, false)) {
-                            setResultCode(Activity.RESULT_OK);
-                            return;
-                        }
+                        synchronized (ActivityManagerService.this) {
+                          if (forceStopPackageLocked(pkg, -1, false, false, false)) {
+                              setResultCode(Activity.RESULT_OK);
+                              return;
+                          }
+                       }
                    }
                }
            }