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

Commit 92a2315d authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ia3ea8f008d04eeef38ade0c289fee718b9673c60
parents d8ec8ff3 c4f632ac

services/core/java/com/android/server/wm/ActivityRecord.java

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

            }