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

Commit ed83ebe1 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

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



Change-Id: I0791be9e5ad9ed2802ca38c6bec723d7423b4b36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 932d04a2 cb2aabc9

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

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

    }