commit 0e7f7b38169090fcf3930690ee5398bfc6ba0083
author Erik Wolsheimer <ewol@google.com> Fri Sep 29 12:12:47 2017 -0700
committer Erik Wolsheimer <ewol@google.com> Mon Oct 02 16:32:50 2017 +0000
tree dd0d305a6e2290baf3f76d6b16ad21f209bd3612
parent f189de75b2ec110c7942292867e68cb0d5b49f33

Prevent NPE at TaskStack#resetAnimationBackgroundAnimator

Bug: 67034123
Change-Id: Ie1c7d8371d146006bc98f3a1ccc25292771ae3f9
(cherry picked from commit 70f5a4a3e807bfe30cd88431207774b23369075c)

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

diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 4308ff9..6527883 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -923,7 +923,9 @@
 
     void resetAnimationBackgroundAnimator() {
         mAnimationBackgroundAnimator = null;
-        mAnimationBackgroundSurface.hide();
+        if (mAnimationBackgroundSurface != null) {
+            mAnimationBackgroundSurface.hide();
+        }
     }
 
     void setAnimationBackground(WindowStateAnimator winAnimator, int color) {