commit 53badc029d478999fb90bbe5e144e4f0a46154b2
author Bryce Lee <brycelee@google.com> Mon Apr 10 11:06:17 2017 -0700
committer gitbuildkicker <android-build@google.com> Mon Apr 10 14:04:05 2017 -0700
tree caa1c649907f173031191cb092938edf18378dc2
parent 3288198721a9f7d5a58d20cb02fde1ef729ae298

Do not set outActivity if value is null.

Recent changes passed down the nullable array to a method where it
was not being properly checked.

Change-Id: Ibf940f9225e4c9901869188aa55a04d0908015c3
Fixes: 37197666
Test: manual via bug repro steps.
(cherry picked from commit 1d8b1afeaf480d6a5c461e1fc10c3dc4b02a64b2)

services/core/java/com/android/server/am/ActivityStarter.java

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