commit dd89c3b56e496ec23329891670dec8d5f6499d64
author Bo Liu <boliu@google.com> Tue Oct 11 20:26:31 2022 -0400
committer Bo Liu <boliu@google.com> Wed Oct 12 13:08:35 2022 +0000
tree 4f88b405b4be2cfc6af2cd7912761cad4b3b04b4
parent c14454d6e03150b4ba9758692e05807cf6b1db24

SurfaceControl ndk-jni API review

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

native/android/surface_control.cpp

diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 21d4d80..8913799 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -139,8 +139,18 @@
 }
 
 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 @@
 }
 
 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) {