Prevent NPE in startActivityUnchecked

Test: manual
Bug: 37931794
Change-Id: I4a968e12cfa99d347f19a8cf2a3b9fba1bf1715b
This commit is contained in:
Fyodor Kupolov
2017-05-03 09:30:19 -07:00
parent 9e37a2e419
commit 625f4936c9

View File

@@ -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;