summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-06-12 20:07:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-06-12 20:07:15 +0000
commit260c9969176641f17075d8ba4003107b9e2a3919 (patch)
tree81821a1cf53fecb7412e3503af4e99a274e4de61
parent31e914a06603ae50b890a20c03874c8dc484c2ad (diff)
parent9fe1f5f50b62d783c149205de86bd81d785c168a (diff)
Merge "Fix PresentFence pointer cast" into main
-rw-r--r--core/jni/android_view_SurfaceControl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index e831a7d229d6..536583840d8f 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -358,7 +358,8 @@ public:
jobject stats =
env->NewObject(gTransactionStatsClassInfo.clazz, gTransactionStatsClassInfo.ctor,
- latchTime, presentFence.get());
+ latchTime,
+ static_cast<jlong>(reinterpret_cast<uintptr_t>(presentFence.get())));
env->CallVoidMethod(mTransactionCompletedListenerObject, gConsumerClassInfo.accept, stats);
env->DeleteLocalRef(stats);
DieIfException(env, "Uncaught exception in TransactionCompletedListener.");