Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-22 18:02:16 +00:00
committed by Android (Google) Code Review
parent 07f580eaff 89cd19a4c4
commit 1ba237d237
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -1051,6 +1051,15 @@ class ActivityStarter {
reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity); 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) { 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 // 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 // if that is the case, so this is it! And for paranoia, make sure we have