From bb2505465586a1177d84de2faa2470f45cf95441 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 20 Mar 2017 20:06:46 -0700
Subject: [PATCH] Fixing NPE when animating bounds.

Bug: 36163225
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I68f807f80768d279cdd55243592f87d3f752b1c6
---
 .../com/android/server/wm/PinnedStackWindowController.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/PinnedStackWindowController.java b/services/core/java/com/android/server/wm/PinnedStackWindowController.java
index 6a0e353ea385a..396f50e06a5dd 100644
--- a/services/core/java/com/android/server/wm/PinnedStackWindowController.java
+++ b/services/core/java/com/android/server/wm/PinnedStackWindowController.java
@@ -64,6 +64,9 @@ public class PinnedStackWindowController extends StackWindowController {
             mContainer.getBounds(originalBounds);
             mContainer.setAnimatingBounds(toBounds);
             UiThread.getHandler().post(() -> {
+                if (mContainer == null) {
+                    return;
+                }
                 mService.mBoundsAnimationController.animateBounds(mContainer, originalBounds,
                         toBounds, animationDuration, moveToFullscreen);
             });