commit 5a24f9c68e2b024b027c77799186dabe8f75861b
author Wenhui Yang <wenhuiy@google.com> Fri Nov 08 21:53:04 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 08 21:53:04 2024 +0000
tree 9ee602f30a49cc3f9182cf6a960ec6eb683ff33c
parent 194e32ec9b383836779f62178c28b03cf5055167
parent b07933ee16c96079debb742b233b93cfcdeb9b3d

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

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

Change-Id: Ie9a54f581f66323d7349af55772d3be6cb2c26e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/view/SurfaceControl.java

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index df54d31..206c737 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -2989,7 +2989,6 @@
         private void apply(boolean sync, boolean oneWay) {
             applyResizedSurfaces();
             notifyReparentedSurfaces();
-            nativeApplyTransaction(mNativeObject, sync, oneWay);
 
             if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {
                 SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(
@@ -2998,6 +2997,7 @@
             if (mCalls != null) {
                 mCalls.clear();
             }
+            nativeApplyTransaction(mNativeObject, sync, oneWay);
         }
 
         /**