Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9e04198 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

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

am: aba60842

Change-Id: I9bcc7cbb15dd5f2ed27d99ce283fa920fc766084
parents 7b4ed646 aba60842

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }