diff options
| author | 2017-05-03 09:30:19 -0700 | |
|---|---|---|
| committer | 2017-05-03 09:30:19 -0700 | |
| commit | 625f4936c95657ddbd98663dc9400e0439907e2a (patch) | |
| tree | 94d10b81c080b158fe84d52939bb123ed7e960fc | |
| parent | 9e37a2e4198d233c3dbee6a985be8e19b5c0dca7 (diff) | |
Prevent NPE in startActivityUnchecked
Test: manual
Bug: 37931794
Change-Id: I4a968e12cfa99d347f19a8cf2a3b9fba1bf1715b
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStarter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 19b9b452df7e..9e19df7473ef 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1059,7 +1059,7 @@ class ActivityStarter { // We didn't do anything... but it was needed (a.k.a., client don't use that // intent!) And for paranoia, make sure we have correctly resumed the top activity. resumeTargetStackIfNeeded(); - if (outActivity.length > 0) { + if (outActivity != null && outActivity.length > 0) { outActivity[0] = reusedActivity; } return START_TASK_TO_FRONT; |