commit 83a236303438453740d5db41b0d017be9e5d56c1
author Jean-Baptiste Queru <jbq@google.com> Thu Jul 22 16:14:18 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 22 16:14:18 2010 -0700
tree 165e8ed76b8da896370046e8b08a221faff3b582
parent 422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a
parent dd29904638fb36cd5585560e83367d1f5565cc4c

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

Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp

* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index a1e6e2b..672149d 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -3549,10 +3549,12 @@
                 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;
+                          }
+                       }
                     }
                 }
             }