From 4d0a2d22fd2cb956e6d64a8511bbc03187a53a85 Mon Sep 17 00:00:00 2001
From: Erik Wolsheimer <ewol@google.com>
Date: Mon, 24 Aug 2015 11:24:05 -0700
Subject: [PATCH] DO NOT MERGE guard against null DimLayer instances in
 TaskStack BUG: 23452983

Change-Id: I8edaafe01b7bca93bfa6a15be0ae49c5e34eff40
---
 services/core/java/com/android/server/wm/TaskStack.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 794b49c8cb19..3da9b4419a7d 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -389,7 +389,9 @@ public class TaskStack {
 
     void resetAnimationBackgroundAnimator() {
         mAnimationBackgroundAnimator = null;
-        mAnimationBackgroundSurface.hide();
+        if (mAnimationBackgroundSurface != null) {
+            mAnimationBackgroundSurface.hide();
+        }
     }
 
     private long getDimBehindFadeDuration(long duration) {
@@ -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) {
-- 
2.11.0