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

Commit 718d5d6f authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Don't set client visibility to false while resumed" into udc-qpr-dev... 

Merge "Don't set client visibility to false while resumed" into udc-qpr-dev am: 63153a29 am: f3f8760c

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



Change-Id: I2dc820ac8f71ef093992634ca2a06d005c1a0e4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e05b759 f3f8760c

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

+4 −3
Original line number Diff line number Diff line
@@ -5666,9 +5666,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // to be some edge cases where we change our visibility but client visibility never gets

        // updated.

        // If we're becoming invisible, update the client visibility if we are not running an

        // animation. Otherwise, we'll update client visibility in onAnimationFinished.

        if (visible || usingShellTransitions

                || !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)) {

        // animation and aren't in RESUMED state. Otherwise, we'll update client visibility in

        // onAnimationFinished or activityStopped.

        if (visible || (mState != RESUMED && (usingShellTransitions || !isAnimating(

                PARENTS, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)))) {

            setClientVisible(visible);

        }