Merge "Trigger app transition explicitly when nothing gets resumed" into rvc-dev am: 44fb3a97ff

Change-Id: I409f75abcbf0a4ee9864bb2271f303b8153eae97
This commit is contained in:
TreeHugger Robot
2020-05-27 16:14:08 +00:00
committed by Automerger Merge Worker

View File

@@ -2638,6 +2638,9 @@ class ActivityStack extends Task {
mRootWindowContainer.ensureVisibilityAndConfig(null /* starting */,
getDisplay().mDisplayId, false /* markFrozenIfConfigChanged */,
false /* deferResume */);
// Usually resuming a top activity triggers the next app transition, but nothing's got
// resumed in this case, so we need to execute it explicitly.
getDisplay().mDisplayContent.executeAppTransition();
} else {
mRootWindowContainer.resumeFocusedStacksTopActivities();
}