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

Commit 495661aa authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Wait on activity brought to front for trampoline activities." into oc-dev am: 1ba237d2 

am: 5ff4d451

Change-Id: I4de41303b1c2a59c9d7470ceab1b8902d2be5596
parents 7036a582 5ff4d451

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

+9 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,15 @@ class ActivityStarter { 


            reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity);



            final ActivityRecord outResult =

                    outActivity != null && outActivity.length > 0 ? outActivity[0] : null;



            // When there is a reused activity and the current result is a trampoline activity,

            // set the reused activity as the result.

            if (outResult != null && (outResult.finishing || outResult.noDisplay)) {

                outActivity[0] = reusedActivity;

            }



            if ((mStartFlags & START_FLAG_ONLY_IF_NEEDED) != 0) {

                // We don't need to start a new activity, and the client said not to do anything

                // if that is the case, so this is it!  And for paranoia, make sure we have