diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f0fb9e627f7c1..cdee392be9eba 100755 --- 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); } }