commit 12aa4e42c8c34f062f7ae10530e1307dcf389b93
author Winson Chung <winsonc@google.com> Mon Mar 20 20:06:46 2017 -0700
committer gitbuildkicker <android-build@google.com> Tue Mar 21 13:59:39 2017 -0700
tree 29ed2e31fc11ed415b036a1cc74b4fb3e1170deb
parent 58288b97635c9f65f250e40fe0f6a482e380b855

Fixing NPE when animating bounds.

Bug: 36163225
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I68f807f80768d279cdd55243592f87d3f752b1c6
(cherry picked from commit bb2505465586a1177d84de2faa2470f45cf95441)

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

diff --git a/services/core/java/com/android/server/wm/PinnedStackWindowController.java b/services/core/java/com/android/server/wm/PinnedStackWindowController.java
index 6a0e353..396f50e 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 @@
             mContainer.getBounds(originalBounds);
             mContainer.setAnimatingBounds(toBounds);
             UiThread.getHandler().post(() -> {
+                if (mContainer == null) {
+                    return;
+                }
                 mService.mBoundsAnimationController.animateBounds(mContainer, originalBounds,
                         toBounds, animationDuration, moveToFullscreen);
             });