Merge "Avoid changing z-order of overlay layer after resizing display" into udc-qpr-dev

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

@@ -2270,7 +2270,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
             // transitions anyways).
             return wc.getParent().asDisplayContent().getWindowingLayer();
         }
-        return wc.getParent().getSurfaceControl();
+        return wc.getParentSurfaceControl();
     }
 
     /**

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

@@ -388,12 +388,23 @@ class WindowToken extends WindowContainer<WindowState> {
     @Override
     SurfaceControl.Builder makeSurface() {
         final SurfaceControl.Builder builder = super.makeSurface();
+        // The overlay may use COLOR_MODE_A8 that needs to be at the top of the display to avoid
+        // additional memory usage, see b/235601833. Note that getParentSurfaceControl() must use
+        // the same parent.
         if (mRoundedCornerOverlay) {
             builder.setParent(null);
         }
         return builder;
     }
 
+    @Override
+    public SurfaceControl getParentSurfaceControl() {
+        if (mRoundedCornerOverlay) {
+            return null;
+        }
+        return super.getParentSurfaceControl();
+    }
+
     boolean isClientVisible() {
         return mClientVisible;
     }