diff options
| author | 2024-11-08 21:31:35 +0000 | |
|---|---|---|
| committer | 2024-11-08 21:31:35 +0000 | |
| commit | b07933ee16c96079debb742b233b93cfcdeb9b3d (patch) | |
| tree | 00c448f98c2407dd07943c46ac93216d1e066ca4 | |
| parent | d6c6211df0f720ce8cdc2caaeeb6794162052c4a (diff) | |
| parent | 9e493bedb220ce08b0fd2b02d77359e261f9e39e (diff) | |
Merge "Fix incorrect transaction id of Transaction#apply call stack debugging" into main am: 9e493bedb2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3304681
Change-Id: Ic05eded2fbb6feb3bdb83f59a1e8ed845cc25e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/SurfaceControl.java | 2 |
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); } /** |