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

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

Merge "Adapt to changing function signature." into main am: af4b7de7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3026303



Change-Id: Ie59fa203569b0adc062e35a9530ae5a4ff90e7c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9143a18b af4b7de7

native/android/surface_control.cpp

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