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

Commit 4d0a2d22 authored by Erik Wolsheimer's avatar Erik Wolsheimer
Browse files

DO NOT MERGE 

guard against null DimLayer instances in TaskStack
BUG: 23452983

Change-Id: I8edaafe01b7bca93bfa6a15be0ae49c5e34eff40
parent f99eba07

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