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

Commit 8cb6b818 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am:... 

Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe am: 5d713e00

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

Change-Id: I544d0b6a083ca903f3932a7a6b239b72aa7d2324
parents f9e0eb08 5d713e00

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

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION; 
import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW;

import static com.android.server.wm.ProtoLogGroup.WM_SHOW_SURFACE_ALLOC;

import static com.android.server.wm.ProtoLogGroup.WM_SHOW_TRANSACTIONS;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;
@@ -1478,7 +1479,7 @@ class WindowStateAnimator { 
            mWin.getDisplayContent().adjustForImeIfNeeded();

        }



        return mWin.isAnimating(PARENTS);

        return mWin.isAnimating(0 /* flags */, ANIMATION_TYPE_WINDOW_ANIMATION);

    }



    void dumpDebug(ProtoOutputStream proto, long fieldId) {