Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev

Author: Chavi Weingarten

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

@@ -3209,8 +3209,9 @@ void onSurfaceShown(SurfaceControl.Transaction t) {
     }
 
     @Override
-    SurfaceControl.Builder makeSurface() {
-        return super.makeSurface().setColorLayer().setMetadata(METADATA_TASK_ID, mTaskId);
+    void setInitialSurfaceControlProperties(SurfaceControl.Builder b) {
+        b.setColorLayer().setMetadata(METADATA_TASK_ID, mTaskId);
+        super.setInitialSurfaceControlProperties(b);
     }
 
     boolean isTaskAnimating() {

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

@@ -399,11 +399,11 @@ void onParentChanged(ConfigurationContainer newParent, ConfigurationContainer ol
     }
 
     void createSurfaceControl(boolean force) {
-        setInitialSurfaceControlProperties(makeSurface().build());
+        setInitialSurfaceControlProperties(makeSurface());
     }
 
-    private void setInitialSurfaceControlProperties(SurfaceControl surfaceControl) {
-        setSurfaceControl(surfaceControl);
+    void setInitialSurfaceControlProperties(SurfaceControl.Builder b) {
+        setSurfaceControl(b.build());
         getSyncTransaction().show(mSurfaceControl);
         onSurfaceShown(getSyncTransaction());
         updateSurfacePosition();
@@ -431,7 +431,7 @@ void migrateToNewSurfaceControl() {
                 .setContainerLayer()
                 .setName(getName());
 
-        setInitialSurfaceControlProperties(b.build());
+        setInitialSurfaceControlProperties(b);
 
         // If parent is null, the layer should be placed offscreen so reparent to null. Otherwise,
         // set to the available parent.