Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SurfaceControl ndk-jni API review

Browse Source 
ASurfaceControl_fromSurfaceControl should acquire a reference before
returning.

Abort if the arguments are invalid, make the return code nonnull.

Test: ASurfaceControlTest#testSurfaceControl_fromSurfaceControl
      and ASurfaceControlTest#testSurfaceTransaction_fromTransaction
Bug: 253053203
Change-Id: If48ff4a534c5765c4831e518e44f77d0429e8981
This commit is contained in:
Bo Liu
2022-10-11 20:26:31 -04:00
parent c14454d6e0
commit dd89c3b56e
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
native/android/surface_control.cpp
View File

@@ -139,8 +139,18 @@ void ASurfaceControl_release(ASurfaceControl* aSurfaceControl) {
}
ASurfaceControl* ASurfaceControl_fromSurfaceControl(JNIEnv* env, jobject surfaceControlObj) {
return reinterpret_cast<ASurfaceControl*>(
android_view_SurfaceControl_getNativeSurfaceControl(env, surfaceControlObj));
LOG_ALWAYS_FATAL_IF(!env,
"nullptr passed to ASurfaceControl_fromSurfaceControl as env argument");
LOG_ALWAYS_FATAL_IF(!surfaceControlObj,
"nullptr passed to ASurfaceControl_fromSurfaceControl as surfaceControlObj "
"argument");
SurfaceControl* surfaceControl =
android_view_SurfaceControl_getNativeSurfaceControl(env, surfaceControlObj);
LOG_ALWAYS_FATAL_IF(!surfaceControl,
"surfaceControlObj passed to ASurfaceControl_fromSurfaceControl is not "
"valid");
SurfaceControl_acquire(surfaceControl);
return reinterpret_cast<ASurfaceControl*>(surfaceControl);
}
struct ASurfaceControlStats {
@@ -200,8 +210,17 @@ void ASurfaceTransaction_delete(ASurfaceTransaction* aSurfaceTransaction) {
}
ASurfaceTransaction* ASurfaceTransaction_fromTransaction(JNIEnv* env, jobject transactionObj) {
return reinterpret_cast<ASurfaceTransaction*>(
android_view_SurfaceTransaction_getNativeSurfaceTransaction(env, transactionObj));
LOG_ALWAYS_FATAL_IF(!env,
"nullptr passed to ASurfaceTransaction_fromTransaction as env argument");
LOG_ALWAYS_FATAL_IF(!transactionObj,
"nullptr passed to ASurfaceTransaction_fromTransaction as transactionObj "
"argument");
Transaction* transaction =
android_view_SurfaceTransaction_getNativeSurfaceTransaction(env, transactionObj);
LOG_ALWAYS_FATAL_IF(!transaction,
"surfaceControlObj passed to ASurfaceTransaction_fromTransaction is not "
"valid");
return reinterpret_cast<ASurfaceTransaction*>(transaction);
}
void ASurfaceTransaction_apply(ASurfaceTransaction* aSurfaceTransaction) {