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

Commit 0970be39 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 4524e06d: am 571dc539: am 17400627: Merge "Avoid NPE in... 

am 4524e06d: am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev

* commit '4524e06d':
  Avoid NPE in forceStopPackageLocked().
parents 439c9f39 4524e06d

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

+1 −1
Original line number Diff line number Diff line
@@ -5661,7 +5661,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    didSomething = true;

                    it.remove();

                    pir.canceled = true;

                    if (pir.key.activity != null) {

                    if (pir.key.activity != null && pir.key.activity.pendingResults != null) {

                        pir.key.activity.pendingResults.remove(pir.ref);

                    }

                }