Chinmay suggestion

Author: Emmanuel Garcia

shell/platform/android/jni/platform_view_android_jni.h

@@ -5,7 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
 
-#include <any>
+#if OS_ANDROID
+#include "flutter/fml/platform/android/jni_weak_ref.h"
+#endif
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
@@ -15,6 +17,12 @@
 
 namespace flutter {
 
+#if OS_ANDROID
+using JavaWeakGlobalRef = fml::jni::JavaObjectWeakGlobalRef;
+#else
+using JavaWeakGlobalRef = std::nullptr_t;
+#endif
+
 //------------------------------------------------------------------------------
 /// Allows to call Java code running in the JVM from any thread. However, most
 /// methods can only be called from the platform thread as that is where the
@@ -74,35 +82,31 @@ class PlatformViewAndroidJNI {
   /// @brief      Attach the SurfaceTexture to the OpenGL ES context that is
   ///             current on the calling thread.
   ///
-  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
-  ///
-  virtual void SurfaceTextureAttachToGLContext(std::any surface_texture,
-                                               int textureId) = 0;
+  virtual void SurfaceTextureAttachToGLContext(
+      JavaWeakGlobalRef surface_texture,
+      int textureId) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Updates the texture image to the most recent frame from the
   ///             image stream.
   ///
-  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
-  ///
-  virtual void SurfaceTextureUpdateTexImage(std::any surface_texture) = 0;
+  virtual void SurfaceTextureUpdateTexImage(
+      JavaWeakGlobalRef surface_texture) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Gets the transform matrix from the SurfaceTexture.
   ///             Then, it updates the `transform` matrix, so it fill the canvas
   ///             and preserve the aspect ratio.
   ///
-  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
-  ///
-  virtual void SurfaceTextureGetTransformMatrix(std::any surface_texture,
-                                                SkMatrix& transform) = 0;
+  virtual void SurfaceTextureGetTransformMatrix(
+      JavaWeakGlobalRef surface_texture,
+      SkMatrix& transform) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Detaches a SurfaceTexture from the OpenGL ES context.
   ///
-  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
-  ///
-  virtual void SurfaceTextureDetachFromGLContext(std::any surface_texture) = 0;
+  virtual void SurfaceTextureDetachFromGLContext(
+      JavaWeakGlobalRef surface_texture) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Positions and sizes a platform view if using hybrid

shell/platform/android/platform_view_android_jni_impl.cc

@@ -29,9 +29,6 @@
 #define ANDROID_SHELL_HOLDER \
   (reinterpret_cast<AndroidShellHolder*>(shell_holder))
 
-#define SURFACE_TEXTURE_LOCAL_REF \
-  (std::any_cast<fml::jni::JavaObjectWeakGlobalRef>(surface_texture))
-
 namespace flutter {
 
 namespace {
@@ -890,12 +887,12 @@ void PlatformViewAndroidJNIImpl::FlutterViewOnPreEngineRestart() {
 }
 
 void PlatformViewAndroidJNIImpl::SurfaceTextureAttachToGLContext(
-    std::any surface_texture,
+    JavaWeakGlobalRef surface_texture,
     int textureId) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
   fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
-      SURFACE_TEXTURE_LOCAL_REF.get(env);
+      surface_texture.get(env);
   if (surface_texture_local_ref.is_null()) {
     return;
   }
@@ -907,11 +904,11 @@ void PlatformViewAndroidJNIImpl::SurfaceTextureAttachToGLContext(
 }
 
 void PlatformViewAndroidJNIImpl::SurfaceTextureUpdateTexImage(
-    std::any surface_texture) {
+    JavaWeakGlobalRef surface_texture) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
   fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
-      SURFACE_TEXTURE_LOCAL_REF.get(env);
+      surface_texture.get(env);
   if (surface_texture_local_ref.is_null()) {
     return;
   }
@@ -935,12 +932,12 @@ SkSize ScaleToFill(float scaleX, float scaleY) {
 }
 
 void PlatformViewAndroidJNIImpl::SurfaceTextureGetTransformMatrix(
-    std::any surface_texture,
+    JavaWeakGlobalRef surface_texture,
     SkMatrix& transform) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
   fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
-      SURFACE_TEXTURE_LOCAL_REF.get(env);
+      surface_texture.get(env);
   if (surface_texture_local_ref.is_null()) {
     return;
   }
@@ -965,11 +962,11 @@ void PlatformViewAndroidJNIImpl::SurfaceTextureGetTransformMatrix(
 }
 
 void PlatformViewAndroidJNIImpl::SurfaceTextureDetachFromGLContext(
-    std::any surface_texture) {
+    JavaWeakGlobalRef surface_texture) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
   fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
-      SURFACE_TEXTURE_LOCAL_REF.get(env);
+      surface_texture.get(env);
   if (surface_texture_local_ref.is_null()) {
     return;
   }

shell/platform/android/platform_view_android_jni_impl.h

@@ -39,15 +39,16 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
 
   void FlutterViewOnPreEngineRestart() override;
 
-  void SurfaceTextureAttachToGLContext(std::any surface_texture,
+  void SurfaceTextureAttachToGLContext(JavaWeakGlobalRef surface_texture,
                                        int textureId) override;
 
-  void SurfaceTextureUpdateTexImage(std::any surface_texture) override;
+  void SurfaceTextureUpdateTexImage(JavaWeakGlobalRef surface_texture) override;
 
-  void SurfaceTextureGetTransformMatrix(std::any surface_texture,
+  void SurfaceTextureGetTransformMatrix(JavaWeakGlobalRef surface_texture,
                                         SkMatrix& transform) override;
 
-  void SurfaceTextureDetachFromGLContext(std::any surface_texture) override;
+  void SurfaceTextureDetachFromGLContext(
+      JavaWeakGlobalRef surface_texture) override;
 
   void FlutterViewOnDisplayPlatformView(int view_id,
                                         int x,