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

2022-05-06 14:25:45 +00:00
parent 4a8619cedb b212cbaca3
commit b5863e8d6c
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(null);
+            builder.setParent(getDisplayContent().getSurfaceControl());
        }
        return builder;
    }