Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f81ef3c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make enum use C compatible." into main am: b30f2dd6 am: bc9f69cb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3023505



Change-Id: I6cfad0917d2c8788b2b4cea4ddeac86d527a5b6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1dfe290 bc9f69cb

include/android/surface_control.h

+2 −2
Original line number Diff line number Diff line
@@ -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);



/**