Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b57b86d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

Merge commit '83a23630'

* commit '83a23630':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
parents d98a803b 83a23630

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

+6 −4
Original line number Diff line number Diff line
@@ -3549,6 +3549,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
                String[] pkgs = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);

                if (pkgs != null) {

                    for (String pkg : pkgs) {

                        synchronized (ActivityManagerService.this) {

                          if (forceStopPackageLocked(pkg, -1, false, false, false)) {

                              setResultCode(Activity.RESULT_OK);

                              return;
@@ -3556,6 +3557,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
                       }

                    }

                }

            }

        }, pkgFilter);

        

        synchronized (this) {