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