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

Commit 27f36f42 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Avoid NPE in forceStopPackageLocked(). 

Bug: 18477180
Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
parent 26750711

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

+1 −1
Original line number Diff line number Diff line
@@ -5660,7 +5660,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);

                    }

                }