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

Commit 307bd0bf authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Android Git Automerger
Browse files

am 379e7343: Merge "DO NOT MERGE guard against null DimLayer instances in... 

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

* commit '379e7343':
  DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983
parents 8373cf7d 379e7343

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) {