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

Commit fb1c7116 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

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

Merge "Shift RoundedCornerOverlay to Display window hierarchy" into tm-dev am: b5863e8d am: 3aa84941

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



Change-Id: Ia3e6d534578a2c12a239b5253609350558ffad15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eeba922c 3aa84941

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -378,7 +378,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(null);

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

        }

        }

        return builder;

        return builder;

    }

    }