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

Commit 091352ef authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Always copy sources to outInsetsState before writeToParcel" into tm-qpr-dev am: 58507e26 

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



Change-Id: Ib3f8c4b5f3ea23fe3c6c0f803f6a8a6ecaf586d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 724ad43a 58507e26

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

+4 −7
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            displayContent.getInsetsStateController().updateAboveInsetsState(

                    false /* notifyInsetsChanged */);



            outInsetsState.set(win.getCompatInsetsState(), win.isClientLocal());

            outInsetsState.set(win.getCompatInsetsState(), true /* copySources */);

            getInsetsSourceControls(win, outActiveControls);



            if (win.mLayoutAttached) {
@@ -2560,7 +2560,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            }



            if (outInsetsState != null) {

                outInsetsState.set(win.getCompatInsetsState(), win.isClientLocal());

                outInsetsState.set(win.getCompatInsetsState(), true /* copySources */);

            }



            ProtoLog.v(WM_DEBUG_FOCUS, "Relayout of %s: focusMayChange=%b",
@@ -8878,7 +8878,6 @@ public class WindowManagerService extends IWindowManager.Stub 
    @Override

    public boolean getWindowInsets(WindowManager.LayoutParams attrs, int displayId,

            InsetsState outInsetsState) {

        final boolean fromLocal = Binder.getCallingPid() == MY_PID;

        final int uid = Binder.getCallingUid();

        final long origId = Binder.clearCallingIdentity();

        try {
@@ -8892,10 +8891,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                final float overrideScale = mAtmService.mCompatModePackages.getCompatScale(

                        attrs.packageName, uid);

                final InsetsState state = dc.getInsetsPolicy().getInsetsForWindowMetrics(attrs);

                final boolean hasCompatScale =

                        WindowState.hasCompatScale(attrs, token, overrideScale);

                outInsetsState.set(state, hasCompatScale || fromLocal);

                if (hasCompatScale) {

                outInsetsState.set(state, true /* copySources */);

                if (WindowState.hasCompatScale(attrs, token, overrideScale)) {

                    final float compatScale = token != null && token.hasSizeCompatBounds()

                            ? token.getSizeCompatScale() * overrideScale

                            : overrideScale;