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

Commit 362436e9 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "More Sync in More Places" into sc-dev am: 1e21b23a 

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

Change-Id: I0ca459aa8c4186167aed9b9807a7c93362bd6b67
parents 850db185 1e21b23a

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

+2 −2
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    private void setCornersRadius(WindowState mainWindow, int cornersRadius) {

        final SurfaceControl windowSurface = mainWindow.getClientViewRootSurface();

        if (windowSurface != null && windowSurface.isValid()) {

            Transaction transaction = getPendingTransaction();

            Transaction transaction = getSyncTransaction();

            transaction.setCornerRadius(windowSurface, cornersRadius);

        }

    }
@@ -1491,7 +1491,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        layoutLetterbox(winHint);

        if (mLetterbox != null && mLetterbox.needsApplySurfaceChanges()) {

            mLetterbox.applySurfaceChanges(getPendingTransaction());

            mLetterbox.applySurfaceChanges(getSyncTransaction());

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -3428,7 +3428,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    /** Updates the layer assignment of windows on this display. */

    void assignWindowLayers(boolean setLayoutNeeded) {

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "assignWindowLayers");

        assignChildLayers(getPendingTransaction());

        assignChildLayers(getSyncTransaction());

        if (setLayoutNeeded) {

            setLayoutNeeded();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -389,12 +389,12 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
            mParent.onChildAdded(this);

        }

        if (!mReparenting) {

            onSyncReparent(oldParent, mParent);

            if (mParent != null && mParent.mDisplayContent != null

                    && mDisplayContent != mParent.mDisplayContent) {

                onDisplayChanged(mParent.mDisplayContent);

            }

            onParentChanged(mParent, oldParent);

            onSyncReparent(oldParent, mParent);

        }

    }