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

Commit 0911a75e authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Correct the return value of applyAnimationLocked."

parents ecb4779f ec4642a9

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.internal.protolog.ProtoLogGroup.WM_SHOW_SURFACE_ALLOC; 
import static com.android.internal.protolog.ProtoLogGroup.WM_SHOW_TRANSACTIONS;

import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM;

import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;

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;
@@ -1327,7 +1328,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) {