Avoid NPE in forceStopPackageLocked().

Bug: 18477180 Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
2014-11-21 14:13:27 -08:00
parent 26750711e1
commit 27f36f4267
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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);
                    }
                }