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

Commit 5a24f9c6 authored by Wenhui Yang's avatar Wenhui Yang Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect transaction id of Transaction#apply call stack debugging"... 

Merge "Fix incorrect transaction id of Transaction#apply call stack debugging" into main am: 9e493bed am: b07933ee

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



Change-Id: Ie9a54f581f66323d7349af55772d3be6cb2c26e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 194e32ec b07933ee

core/java/android/view/SurfaceControl.java

+1 −1
Original line number Diff line number Diff line
@@ -2989,7 +2989,6 @@ public final class SurfaceControl implements Parcelable { 
        private void apply(boolean sync, boolean oneWay) {

            applyResizedSurfaces();

            notifyReparentedSurfaces();

            nativeApplyTransaction(mNativeObject, sync, oneWay);



            if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {

                SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(
@@ -2998,6 +2997,7 @@ public final class SurfaceControl implements Parcelable { 
            if (mCalls != null) {

                mCalls.clear();

            }

            nativeApplyTransaction(mNativeObject, sync, oneWay);

        }



        /**