diff options
| author | 2017-03-20 20:06:46 -0700 | |
|---|---|---|
| committer | 2017-03-21 18:11:25 +0000 | |
| commit | bb2505465586a1177d84de2faa2470f45cf95441 (patch) | |
| tree | 625377ef4cf55d3c35e6fd817d90585b1b0adaa2 | |
| parent | 914c4ab1ed31c99886c83d005f255b97a9a70ed5 (diff) | |
Fixing NPE when animating bounds.
Bug: 36163225
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I68f807f80768d279cdd55243592f87d3f752b1c6
| -rw-r--r-- | services/core/java/com/android/server/wm/PinnedStackWindowController.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/PinnedStackWindowController.java b/services/core/java/com/android/server/wm/PinnedStackWindowController.java index 6a0e353ea385..396f50e06a5d 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); }); |