commit 7991ae1a5f521a429bb8eb240dcad96a3b54daeb
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 27 17:11:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 27 17:11:32 2019 +0000
tree bd3baad9c2dc319b3ccbe4cd14cdf2ad8bbc9503
parent fab3ee9bbc3eaedd64b58ae41824e452b5efa6ec
parent fe16a37d1bd2b4d312f21690198055fedaab262a

Merge "Return bounds when it's in fullscreen display."

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

diff --git a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java
index 76dd7be..e2d0acd 100644
--- a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java
+++ b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java
@@ -278,7 +278,7 @@
                 // an existing task.
                 adjustBoundsToAvoidConflictInDisplay(display, outParams.mBounds);
             }
-        } else {
+        } else if (display.inFreeformWindowingMode()) {
             if (source != null && source.inFreeformWindowingMode()
                     && resolvedMode == WINDOWING_MODE_FREEFORM
                     && outParams.mBounds.isEmpty()

services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java
index 24ff07d..c4b0a80 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java
@@ -1196,7 +1196,7 @@
                 mActivity, /* source */ null, /* options */ null, mCurrent, mResult));
 
         // Returned bounds with in fullscreen mode will be set to last non-fullscreen bounds.
-        assertEquals(new Rect(0, 0, 200, 100), mCurrent.mBounds);
+        assertEquals(new Rect(0, 0, 200, 100), mResult.mBounds);
     }
 
     @Test