From 8fd3ef1d63c3933319401701b0f923ce52a6dc39 Mon Sep 17 00:00:00 2001
From: Jing Wang <jwangh@google.com>
Date: Wed, 18 May 2022 23:17:59 +0000
Subject: [PATCH] Revert "Shift RoundedCornerOverlay to Display window
 hierarchy"

This reverts commit b212cbaca3051d239c95e329380047ced0ff9632.

Reason for revert: DPU SysMMU Page Fault

Bug: b/231553814

Change-Id: Ida1aed955c0d02461bc0cb55278a05489cd6b068
---
 services/core/java/com/android/server/wm/WindowToken.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java
index ed9b2f072bff5..d2e56faa0914c 100644
--- 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;
     }