summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2014-11-21 14:13:27 -0800
committer Jeff Sharkey <jsharkey@android.com> 2014-11-21 14:17:17 -0800
commit27f36f426702acf7ba3103997e5009da2cd67c80 (patch)
treee656f5597d770a2fc1b9a7e0623df7c6cfa7cecb
parent26750711e12900aca6c7c35556b4548038cfb505 (diff)
Avoid NPE in forceStopPackageLocked().
Bug: 18477180 Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f0fb9e627f7c..cdee392be9eb 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);
}
}