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

* commit '571dc539a120f234ecfc847edf57edc7762ab862': Avoid NPE in forceStopPackageLocked().
2014-11-21 23:24:08 +00:00
parent c8d97850a8 571dc539a1
commit 4524e06de7
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);
                    }
                }