Merge "Override the fillsParent() on TaskFragment" into sc-v2-dev

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

@@ -3158,14 +3158,6 @@ class Task extends TaskFragment {
                 || activityType == ACTIVITY_TYPE_ASSISTANT;
     }
 
-    @Override
-    boolean fillsParent() {
-        // From the perspective of policy, we still want to report that this task fills parent
-        // in fullscreen windowing mode even it doesn't match parent bounds because there will be
-        // letterbox around its real content.
-        return getWindowingMode() == WINDOWING_MODE_FULLSCREEN || matchParentBounds();
-    }
-
     @Override
     void forAllLeafTasks(Consumer<Task> callback, boolean traverseTopToBottom) {
         final int count = mChildren.size();

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

@@ -2346,6 +2346,14 @@ class TaskFragment extends WindowContainer<WindowContainer> {
         return true;
     }
 
+    @Override
+    boolean fillsParent() {
+        // From the perspective of policy, we still want to report that this task fills parent
+        // in fullscreen windowing mode even it doesn't match parent bounds because there will be
+        // letterbox around its real content.
+        return getWindowingMode() == WINDOWING_MODE_FULLSCREEN || matchParentBounds();
+    }
+
     boolean dump(String prefix, FileDescriptor fd, PrintWriter pw, boolean dumpAll,
             boolean dumpClient, String dumpPackage, final boolean needSep, Runnable header) {
         boolean printed = false;