diff options
| author | 2024-04-04 16:59:09 +0000 | |
|---|---|---|
| committer | 2024-04-04 16:59:09 +0000 | |
| commit | f81ef3c8d68cb5c8fe7b6db22849dbc9a179a7bb (patch) | |
| tree | 59ed5ff55b33470ef2e9da6652274058f6198631 /include/android | |
| parent | d1dfe2905bd9f90549f32c3df3a6831a7579beae (diff) | |
| parent | bc9f69cb3aa7fe166ad14154bfb5d1b33090a5f8 (diff) | |
Merge "Make enum use C compatible." into main am: b30f2dd618 am: bc9f69cb3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3023505
Change-Id: I6cfad0917d2c8788b2b4cea4ddeac86d527a5b6a
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 fb1419f0b2..1bd6b161f6 100644 --- a/include/android/surface_control.h +++ b/include/android/surface_control.h @@ -362,7 +362,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); /** @@ -501,7 +501,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); /** |