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

Commit 1b14c6ba authored by Jing Wang's avatar Jing Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Shift RoundedCornerOverlay to Display window hierarchy"" into... 

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

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



Change-Id: Icf31854e2ce5b71a747e872f39eca82a4e24b27b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9013933a ed83ebe1

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -379,7 +379,7 @@ class WindowToken extends WindowContainer<WindowState> { 
    SurfaceControl.Builder makeSurface() {

    SurfaceControl.Builder makeSurface() {

        final SurfaceControl.Builder builder = super.makeSurface();

        final SurfaceControl.Builder builder = super.makeSurface();

        if (mRoundedCornerOverlay) {

        if (mRoundedCornerOverlay) {

            builder.setParent(getDisplayContent().getSurfaceControl());

            builder.setParent(null);

        }

        }

        return builder;

        return builder;

    }

    }