Merge "Do not use docked stack bounds unless all conditions are met."

2017-02-14 20:31:59 +00:00
parent e5b514cbc3 fa378d84a2
commit 774bd7a6f4
1 changed files with 6 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -423,8 +423,12 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
        mBoundsAfterRotation.setEmpty();
        final DockedStackDividerController controller = getDisplayContent()
                .mDividerControllerLocked;
-        if (controller.isMinimizedDock() && mStackId == DOCKED_STACK_ID) {
-            outTempBounds.set(controller.getMiddlePositionDockedStackRect());
+        if (mStackId == DOCKED_STACK_ID) {
+            final Rect dockedStackRect = controller.getMiddlePositionDockedStackRect();
+
+            if (dockedStackRect != null) {
+                outTempBounds.set(dockedStackRect);
+            }
        }
    }