Migrate JNI functions in StarboardBridge

b/389117681
youtube · Jan 10, 2025 · 23ade15 · 23ade15
1 parent 632168a
commit 23ade15
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/cobalt/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java b/cobalt/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java
@@ -288,10 +288,8 @@ public Context getApplicationContext() {
     return appContext;
   }
 
-  // TODO: (cobalt b/372559388) remove or migrate JNI?
-  // Used in starboard/android/shared/system_platform_error.cc
   @SuppressWarnings("unused")
-  @UsedByNative
+  @CalledByNative
   void raisePlatformError(@PlatformError.ErrorType int errorType, long data) {
     PlatformError error = new PlatformError(activityHolder, errorType, data);
     error.raise();

diff --git a/starboard/android/shared/starboard_bridge.cc b/starboard/android/shared/starboard_bridge.cc
@@ -151,6 +151,14 @@ StarboardBridge::GetSupportedHdrTypes(JNIEnv* env) {
   SB_DCHECK(env);
   return Java_StarboardBridge_getSupportedHdrTypes(env, j_starboard_bridge_);
 }
+
+void StarboardBridge::RaisePlatformError(JNIEnv* env,
+                                         jint errorType,
+                                         jlong data) {
+  SB_DCHECK(env);
+  Java_StarboardBridge_raisePlatformError(env, j_starboard_bridge_, errorType,
+                                          data);
+}
 }  // namespace shared
 }  // namespace android
 }  // namespace starboard
diff --git a/starboard/android/shared/starboard_bridge.h b/starboard/android/shared/starboard_bridge.h
@@ -49,6 +49,8 @@ class StarboardBridge {
   base::android::ScopedJavaLocalRef<jintArray> GetSupportedHdrTypes(
       JNIEnv* env);
 
+  void RaisePlatformError(JNIEnv* env, jint errorType, jlong data);
+
  private:
   StarboardBridge() = default;
   ~StarboardBridge() = default;

diff --git a/starboard/android/shared/system_platform_error.cc b/starboard/android/shared/system_platform_error.cc
@@ -20,10 +20,9 @@
 #include <functional>
 
 #include "starboard/android/shared/application_android.h"
-#include "starboard/android/shared/jni_env_ext.h"
+#include "starboard/android/shared/starboard_bridge.h"
 
 using starboard::android::shared::ApplicationAndroid;
-using starboard::android::shared::JniEnvExt;
 
 namespace {
 
@@ -50,7 +49,7 @@ bool SbSystemRaisePlatformError(SbSystemPlatformErrorType type,
       return false;
   }
 
-  JniEnvExt* env = JniEnvExt::Get();
+  JNIEnv* env = base::android::AttachCurrentThread();
 
   auto send_response_callback =
       callback ? new SendResponseCallback(
@@ -60,9 +59,9 @@ bool SbSystemRaisePlatformError(SbSystemPlatformErrorType type,
                      })
                : nullptr;
 
-  env->CallStarboardVoidMethodOrAbort(
-      "raisePlatformError", "(IJ)V", jni_error_type,
-      reinterpret_cast<jlong>(send_response_callback));
+  starboard::android::shared::StarboardBridge::GetInstance()
+      ->RaisePlatformError(env, jni_error_type,
+                           reinterpret_cast<jlong>(send_response_callback));
   return true;
 }