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

Commit 23af702a authored by Bo Liu's avatar Bo Liu
Browse files

Rename SC ndk jni API 

Rename to ASurfaceControl_fromJava / ASurfaceTransaction_fromJava.

Test: Compiles
Bug: 258245761
Change-Id: Ic9cedd83bad3facb46947ecdac6324f4318d8db6
parent 4e72b984

native/android/libandroid.map.txt

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ LIBANDROID { 
    ASurfaceControl_createFromWindow; # introduced=29

    ASurfaceControl_acquire; # introduced=31

    ASurfaceControl_release; # introduced=29

    ASurfaceControl_fromSurfaceControl; # introduced=34

    ASurfaceControl_fromJava; # introduced=34

    ASurfaceTexture_acquireANativeWindow; # introduced=28

    ASurfaceTexture_attachToGLContext; # introduced=28

    ASurfaceTexture_detachFromGLContext; # introduced=28
@@ -256,7 +256,7 @@ LIBANDROID { 
    ASurfaceTransaction_apply; # introduced=29

    ASurfaceTransaction_create; # introduced=29

    ASurfaceTransaction_delete; # introduced=29

    ASurfaceTransaction_fromTransaction; # introduced=34

    ASurfaceTransaction_fromJava; # introduced=34

    ASurfaceTransaction_reparent; # introduced=29

    ASurfaceTransaction_setBuffer; # introduced=29

    ASurfaceTransaction_setBufferAlpha; # introduced=29

native/android/surface_control.cpp

+8 −13
Original line number Diff line number Diff line
@@ -138,17 +138,14 @@ void ASurfaceControl_release(ASurfaceControl* aSurfaceControl) { 
    SurfaceControl_release(surfaceControl);

}



ASurfaceControl* ASurfaceControl_fromSurfaceControl(JNIEnv* env, jobject surfaceControlObj) {

    LOG_ALWAYS_FATAL_IF(!env,

                        "nullptr passed to ASurfaceControl_fromSurfaceControl as env argument");

ASurfaceControl* ASurfaceControl_fromJava(JNIEnv* env, jobject surfaceControlObj) {

    LOG_ALWAYS_FATAL_IF(!env, "nullptr passed to ASurfaceControl_fromJava as env argument");

    LOG_ALWAYS_FATAL_IF(!surfaceControlObj,

                        "nullptr passed to ASurfaceControl_fromSurfaceControl as surfaceControlObj "

                        "argument");

                        "nullptr passed to ASurfaceControl_fromJava as surfaceControlObj argument");

    SurfaceControl* surfaceControl =

            android_view_SurfaceControl_getNativeSurfaceControl(env, surfaceControlObj);

    LOG_ALWAYS_FATAL_IF(!surfaceControl,

                        "surfaceControlObj passed to ASurfaceControl_fromSurfaceControl is not "

                        "valid");

                        "surfaceControlObj passed to ASurfaceControl_fromJava is not valid");

    SurfaceControl_acquire(surfaceControl);

    return reinterpret_cast<ASurfaceControl*>(surfaceControl);

}
@@ -209,17 +206,15 @@ void ASurfaceTransaction_delete(ASurfaceTransaction* aSurfaceTransaction) { 
    delete transaction;

}



ASurfaceTransaction* ASurfaceTransaction_fromTransaction(JNIEnv* env, jobject transactionObj) {

    LOG_ALWAYS_FATAL_IF(!env,

                        "nullptr passed to ASurfaceTransaction_fromTransaction as env argument");

ASurfaceTransaction* ASurfaceTransaction_fromJava(JNIEnv* env, jobject transactionObj) {

    LOG_ALWAYS_FATAL_IF(!env, "nullptr passed to ASurfaceTransaction_fromJava as env argument");

    LOG_ALWAYS_FATAL_IF(!transactionObj,

                        "nullptr passed to ASurfaceTransaction_fromTransaction as transactionObj "

                        "nullptr passed to ASurfaceTransaction_fromJava as transactionObj "

                        "argument");

    Transaction* transaction =

            android_view_SurfaceTransaction_getNativeSurfaceTransaction(env, transactionObj);

    LOG_ALWAYS_FATAL_IF(!transaction,

                        "surfaceControlObj passed to ASurfaceTransaction_fromTransaction is not "

                        "valid");

                        "surfaceControlObj passed to ASurfaceTransaction_fromJava is not valid");

    return reinterpret_cast<ASurfaceTransaction*>(transaction);

}