onEndFrame JNI

Author: cg021

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -22,6 +22,7 @@
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
 import io.flutter.embedding.engine.renderer.RenderSurface;
 import io.flutter.plugin.common.StandardMessageCodec;
+import io.flutter.plugin.platform.PlatformViewsController;
 import io.flutter.view.AccessibilityBridge;
 import io.flutter.view.FlutterCallbackInformation;
 import java.nio.ByteBuffer;
@@ -168,6 +169,7 @@ public static native void nativeOnVsync(
   @Nullable private Long nativePlatformViewId;
   @Nullable private AccessibilityDelegate accessibilityDelegate;
   @Nullable private PlatformMessageHandler platformMessageHandler;
+  @Nullable private PlatformViewsController platformViewsController;
 
   @NonNull
   private final Set<EngineLifecycleListener> engineLifecycleListeners = new CopyOnWriteArraySet<>();
@@ -415,6 +417,12 @@ private native void nativeDispatchPointerDataPacket(
       long nativePlatformViewId, @NonNull ByteBuffer buffer, int position);
   // ------ End Touch Interaction Support ---
 
+  @UiThread
+  public void setPlatformViewsController(@NonNull PlatformViewsController platformViewsController) {
+    ensureRunningOnMainThread();
+    this.platformViewsController = platformViewsController;
+  }
+
   // ------ Start Accessibility Support -----
   /**
    * Sets the {@link AccessibilityDelegate} for the attached Flutter context.
@@ -780,6 +788,17 @@ private void onPreEngineRestart() {
       listener.onPreEngineRestart();
     }
   }
+
+  @SuppressWarnings("unused")
+  @UiThread
+  public void onEndFrame() {
+    ensureRunningOnMainThread();
+    if (platformViewsController == null) {
+      throw new RuntimeException(
+          "platformViewsController must be set before attempting to end the frame");
+    }
+    platformViewsController.onEndFrame();
+  }
   // ----- End Engine Lifecycle Support ----
 
   // TODO(mattcarroll): determine if this is nonull or nullable

shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java

@@ -533,4 +533,8 @@ private void flushAllViews() {
     }
     vdControllers.clear();
   }
+
+  public void onEndFrame() {
+    // TODO: Implement this method. https://github.com/flutter/flutter/issues/58288
+  }
 }

shell/platform/android/platform_view_android_jni.cc

@@ -118,6 +118,12 @@ void FlutterViewOnPreEngineRestart(JNIEnv* env, jobject obj) {
   FML_CHECK(CheckException(env));
 }
 
+static jmethodID g_on_end_frame_method = nullptr;
+void FlutterViewEndFrame(JNIEnv* env, jobject obj) {
+  env->CallVoidMethod(obj, g_on_end_frame_method);
+  FML_CHECK(CheckException(env));
+}
+
 static jmethodID g_attach_to_gl_context_method = nullptr;
 void SurfaceTextureAttachToGLContext(JNIEnv* env, jobject obj, jint textureId) {
   env->CallVoidMethod(obj, g_attach_to_gl_context_method, textureId);
@@ -757,6 +763,14 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     return false;
   }
 
+  g_on_end_frame_method =
+      env->GetMethodID(g_flutter_jni_class->obj(), "onEndFrame", "()V");
+
+  if (g_on_end_frame_method == nullptr) {
+    FML_LOG(ERROR) << "Could not locate onEndFrame method";
+    return false;
+  }
+
   g_attach_to_gl_context_method = env->GetMethodID(
       g_surface_texture_class->obj(), "attachToGLContext", "(I)V");
 

shell/platform/android/test/io/flutter/embedding/engine/FlutterJNITest.java

@@ -1,8 +1,12 @@
 package io.flutter.embedding.engine;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
+import io.flutter.plugin.platform.PlatformViewsController;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,4 +48,19 @@ public void onFlutterUiNoLongerDisplayed() {}
     // --- Verify Results ---
     assertEquals(1, callbackInvocationCount.get());
   }
+
+  @Test
+  public void onEndFrame__callsPlatformViewsController() {
+    PlatformViewsController platformViewsController = mock(PlatformViewsController.class);
+
+    // --- Test Setup ---
+    FlutterJNI flutterJNI = new FlutterJNI();
+    flutterJNI.setPlatformViewsController(platformViewsController);
+
+    // --- Execute Test ---
+    flutterJNI.onEndFrame();
+
+    // --- Verify Results ---
+    verify(platformViewsController, times(1)).onEndFrame();
+  }
 }