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

Commit 653245e4 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix crash while animating removed stack" into qt-dev am:...

Merge "Merge "Fix crash while animating removed stack" into qt-dev am: f8b534a8 am: 7216f80e am: 0282a445"
parents 699c5b21 e6f2974a
Loading
Loading
Loading
Loading
+6 −2
Original line number Original line Diff line number Diff line
@@ -1931,8 +1931,12 @@ public class TaskStack extends WindowContainer<Task> implements
    public boolean setPinnedStackAlpha(float alpha) {
    public boolean setPinnedStackAlpha(float alpha) {
        // Hold the lock since this is called from the BoundsAnimator running on the UiThread
        // Hold the lock since this is called from the BoundsAnimator running on the UiThread
        synchronized (mWmService.mGlobalLock) {
        synchronized (mWmService.mGlobalLock) {
            getPendingTransaction().setAlpha(getSurfaceControl(),
            final SurfaceControl sc = getSurfaceControl();
                    mCancelCurrentBoundsAnimation ? 1 : alpha);
            if (sc == null || !sc.isValid()) {
                // If the stack is already removed, don't bother updating any stack animation
                return false;
            }
            getPendingTransaction().setAlpha(sc, mCancelCurrentBoundsAnimation ? 1 : alpha);
            scheduleAnimation();
            scheduleAnimation();
            return !mCancelCurrentBoundsAnimation;
            return !mCancelCurrentBoundsAnimation;
        }
        }