Merge "Revert "Shift RoundedCornerOverlay to Display window hierarchy"" into tm-dev

2022-05-19 03:00:00 +00:00
parent e1062bc792 8fd3ef1d63
commit 0e2cc380d3
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowToken.java
+++ b/services/core/java/com/android/server/wm/WindowToken.java
@@ -378,7 +378,7 @@ class WindowToken extends WindowContainer<WindowState> {
    SurfaceControl.Builder makeSurface() {
        final SurfaceControl.Builder builder = super.makeSurface();
        if (mRoundedCornerOverlay) {
-            builder.setParent(getDisplayContent().getSurfaceControl());
+            builder.setParent(null);
        }
        return builder;
    }