Merge "Prevent NPE at TaskStack#resetAnimationBackgroundAnimator"

2017-10-02 18:16:49 +00:00
parent b101c34778 0e7f7b3816
commit f62d88c7bc
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -923,7 +923,9 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye

    void resetAnimationBackgroundAnimator() {
        mAnimationBackgroundAnimator = null;
-        mAnimationBackgroundSurface.hide();
+        if (mAnimationBackgroundSurface != null) {
+            mAnimationBackgroundSurface.hide();
+        }
    }

    void setAnimationBackground(WindowStateAnimator winAnimator, int color) {