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

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

@@ -278,7 +278,7 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
                 // 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

@@ -1196,7 +1196,7 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase {
                 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