From 23af702a13a10b4558419e70c539c66ffd00d356 Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Fri, 11 Nov 2022 15:00:19 -0500 Subject: [PATCH] Rename SC ndk jni API Rename to ASurfaceControl_fromJava / ASurfaceTransaction_fromJava. Test: Compiles Bug: 258245761 Change-Id: Ic9cedd83bad3facb46947ecdac6324f4318d8db6 --- native/android/libandroid.map.txt | 4 ++-- native/android/surface_control.cpp | 21 ++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index cb0f22f974ad9..0b70b9bde3761 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -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 diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 891379977a6c1..ea20c6c9e0b14 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -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(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(transaction); }