Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev

2014-11-21 23:14:03 +00:00
parent 0a398d7bb4 27f36f4267
commit 1740062728
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
@@ -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);
                    }
                }