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

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 505a82a1518f..884a66c477b4 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -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);
         }
 
         /**