diff options
| author | 2024-04-04 16:50:09 +0000 | |
|---|---|---|
| committer | 2024-04-04 16:50:09 +0000 | |
| commit | bc9f69cb3aa7fe166ad14154bfb5d1b33090a5f8 (patch) | |
| tree | 470bd165d46b79bf02d7b992e862795a77ffddce /include/android | |
| parent | 74661b828aca79e53a3268e85b553c03225faa8a (diff) | |
| parent | b30f2dd6188255e61c53ce9d51d174615227290e (diff) | |
Merge "Make enum use C compatible." into main am: b30f2dd618
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3023505
Change-Id: I4c41ce6802c79866caeff23121ca6915746a4ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'include/android')
| -rw-r--r-- | include/android/surface_control.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/android/surface_control.h b/include/android/surface_control.h index 23461e27b5..1237aa6f1c 100644 --- a/include/android/surface_control.h +++ b/include/android/surface_control.h @@ -358,7 +358,7 @@ void ASurfaceTransaction_setBuffer(ASurfaceTransaction* transaction, */ void ASurfaceTransaction_setColor(ASurfaceTransaction* transaction, ASurfaceControl* surface_control, float r, float g, float b, - float alpha, ADataSpace dataspace) + float alpha, enum ADataSpace dataspace) __INTRODUCED_IN(29); /** @@ -497,7 +497,7 @@ void ASurfaceTransaction_setBufferAlpha(ASurfaceTransaction* transaction, * Available since API level 29. */ void ASurfaceTransaction_setBufferDataSpace(ASurfaceTransaction* transaction, - ASurfaceControl* surface_control, ADataSpace data_space) + ASurfaceControl* surface_control, enum ADataSpace data_space) __INTRODUCED_IN(29); /** |