Merge "Do not set outActivity if value is null." into oc-dev

am: a09111e745 Change-Id: I5bae5f17d2b50f845f1b147458b3351bbf99b615
2017-04-10 20:32:17 +00:00
parent 1bbe822a5c a09111e745
commit aba6084239
1 changed files with 1 additions and 1 deletions
--- 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;
            }