diff options
| -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 59f6098684eb..56594d3fdf48 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1038,7 +1038,7 @@ class ActivityStarter { sendPowerHintForLaunchStartIfNeeded(false /* forceSend */); reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity); - if (outActivity.length > 0) { + if (outActivity != null && outActivity.length > 0) { outActivity[0] = reusedActivity; } |