Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e94dc9 authored by Jing Wang's avatar Jing Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Shift RoundedCornerOverlay to Display window hierarchy"" into tm-dev am: 0e2cc380 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18471174



Change-Id: Ic31a576d420c05c847f153b8e99aa449678202b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4acf4a41 0e2cc380

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }