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

Commit 0514dacd authored by wilsonshih's avatar wilsonshih
Browse files

Fix staring window being hide after AR#commitVisibility 

For legacy app transition, a visible activity could commit visibility
after transition start, so it won't clear the policy visibility flag
on starting window immediately. But for shell transition, there will
call commit visibility immediately after setVisibility, which let
the starting window be hidden with policy visibility flag.
To make the condition more generic, also check firstWindowDrawn or
allDrawn before clear the flag.

Bug: 199363064
Test: No change when using app transition.
Test: Enable shell transition, check the starting window is really
visible on SF layer when launch app.

Change-Id: I93a9f23c8d686c7bd176ae2806c28675562efc53
parent 039e8a7b

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -4935,7 +4935,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else {

        } else {

            // If we are being set visible, and the starting window is not yet displayed,

            // If we are being set visible, and the starting window is not yet displayed,

            // then make sure it doesn't get 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.clearPolicyVisibilityFlag(LEGACY_POLICY_VISIBILITY);

                mStartingWindow.mLegacyPolicyVisibilityAfterAnim = false;

                mStartingWindow.mLegacyPolicyVisibilityAfterAnim = false;

            }

            }