Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp

* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
This commit is contained in:
Jean-Baptiste Queru
2010-07-22 16:14:18 -07:00
committed by Android Git Automerger
parent 422e700ee4 dd29904638
commit 83a2363034
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3549,10 +3549,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
String[] pkgs = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES); String[] pkgs = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
if (pkgs != null) { if (pkgs != null) {
for (String pkg : pkgs) { for (String pkg : pkgs) {
if (forceStopPackageLocked(pkg, -1, false, false, false)) { synchronized (ActivityManagerService.this) {
setResultCode(Activity.RESULT_OK); if (forceStopPackageLocked(pkg, -1, false, false, false)) {
return; setResultCode(Activity.RESULT_OK);
} return;
}
}
} }
} }
} }