summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-04-04 16:59:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-04 16:59:19 +0000
commit8f9e245e1a6a06cc53cc3ae37605a7f1aa7ae80a (patch)
tree37ec9476ab65b19ef634f294e4beb89d5a03492e
parent01b20657d67495e1aee0a6eaa8ba5bf8416853fc (diff)
parent98914f7dfb901a05157744dbf9c44bc0090d4bd2 (diff)
Merge "Adapt to changing function signature." into main am: af4b7de711 am: 98914f7dfb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3026303 Change-Id: Id2a210718afe7a23b144d6ed3f889be931c6db11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--native/android/surface_control.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 9b1330fc048a..6ce83cd7b765 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -367,7 +367,7 @@ void ASurfaceTransaction_reparent(ASurfaceTransaction* aSurfaceTransaction,
void ASurfaceTransaction_setVisibility(ASurfaceTransaction* aSurfaceTransaction,
ASurfaceControl* aSurfaceControl,
- int8_t visibility) {
+ ASurfaceTransactionVisibility visibility) {
CHECK_NOT_NULL(aSurfaceTransaction);
CHECK_NOT_NULL(aSurfaceControl);
@@ -496,7 +496,7 @@ void ASurfaceTransaction_setScale(ASurfaceTransaction* aSurfaceTransaction,
void ASurfaceTransaction_setBufferTransparency(ASurfaceTransaction* aSurfaceTransaction,
ASurfaceControl* aSurfaceControl,
- int8_t transparency) {
+ ASurfaceTransactionTransparency transparency) {
CHECK_NOT_NULL(aSurfaceTransaction);
CHECK_NOT_NULL(aSurfaceControl);