Merge "Fix staring window being hide after AR#commitVisibility" into sc-v2-dev am: c4f632ac9f am: 92a2315d06

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15852330

Change-Id: Ibc5059af5b05081f574cec9afd83f85a41afe71d
This commit is contained in:
Wei Sheng Shih
2021-10-06 01:45:05 +00:00
committed by Automerger Merge Worker

View File

@@ -4940,7 +4940,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
} else {
// If we are being set visible, and the starting window is not yet displayed,
// then make sure it doesn't get displayed.
if (mStartingWindow != null && !mStartingWindow.isDrawn()) {
if (mStartingWindow != null && !mStartingWindow.isDrawn()
&& (firstWindowDrawn || allDrawn)) {
mStartingWindow.clearPolicyVisibilityFlag(LEGACY_POLICY_VISIBILITY);
mStartingWindow.mLegacyPolicyVisibilityAfterAnim = false;
}