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

Commit 379e7343 authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev

parents 5d552f2c 4d0a2d22

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

+7 −2
Original line number Diff line number Diff line
@@ -389,8 +389,10 @@ public class TaskStack { 


    void resetAnimationBackgroundAnimator() {

        mAnimationBackgroundAnimator = null;

        if (mAnimationBackgroundSurface != null) {

            mAnimationBackgroundSurface.hide();

        }

    }



    private long getDimBehindFadeDuration(long duration) {

        TypedValue tv = new TypedValue();
@@ -454,11 +456,14 @@ public class TaskStack { 
    }



    boolean isDimming() {

        if (mDimLayer == null) {

            return false;

        }

        return mDimLayer.isDimming();

    }



    boolean isDimming(WindowStateAnimator winAnimator) {

        return mDimWinAnimator == winAnimator && mDimLayer.isDimming();

        return mDimWinAnimator == winAnimator && isDimming();

    }



    void startDimmingIfNeeded(WindowStateAnimator newWinAnimator) {