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

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

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



Change-Id: Ic05eded2fbb6feb3bdb83f59a1e8ed845cc25e9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6c6211d 9e493bed

core/java/android/view/SurfaceControl.java

+1 −1
Original line number Diff line number Diff line
@@ -2917,12 +2917,12 @@ 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(

                        "apply", this, null, null);

            }

            nativeApplyTransaction(mNativeObject, sync, oneWay);

        }



        /**