merge conflicts

Author: cg021

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

@@ -828,9 +828,9 @@ public FlutterOverlaySurface createOverlaySurface() {
     ensureRunningOnMainThread();
     if (platformViewsController == null) {
       throw new RuntimeException(
-          "platformViewsController must be set before attempting to position an overlay surface");
+          "platformViewsController must be set before attempting to create an overlay surface");
     }
-    platformViewsController.onDisplayOverlaySurface(id, x, y, width, height);
+    return platformViewsController.createOverlaySurface();
   }
   // ----- End Engine Lifecycle Support ----
 

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

@@ -17,6 +17,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 import androidx.annotation.VisibleForTesting;
+import io.flutter.embedding.engine.FlutterOverlaySurface;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel;
 import io.flutter.embedding.engine.FlutterOverlaySurface;

shell/platform/android/platform_view_android_jni_impl.cc

@@ -80,6 +80,19 @@ static jmethodID g_on_first_frame_method = nullptr;
 
 static jmethodID g_on_engine_restart_method = nullptr;
 
+<<<<<<< HEAD
+=======
+static jmethodID g_on_begin_frame_method = nullptr;
+
+static jmethodID g_on_end_frame_method = nullptr;
+
+static jmethodID g_create_overlay_surface_method = nullptr;
+
+static jmethodID g_flutter_overlay_layer_get_id_method = nullptr;
+
+static jmethodID g_flutter_overlay_layer_get_surface_method = nullptr;
+
+>>>>>>> fac302be46c3fa3a969884c223746c3054d73999
 static jmethodID g_create_overlay_surface_method = nullptr;
 static jmethodID g_flutter_overlay_layer_get_id_method = nullptr;
 static jmethodID g_flutter_overlay_layer_get_surface_method = nullptr;
@@ -771,9 +784,9 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     FML_LOG(ERROR) << "Could not locate onEndFrame method";
     return false;
   }
-
-  g_create_overlay_surface_method =
-      env->GetMethodID(g_flutter_jni_class->obj(), "createOverlaySurface", "()V");
+  
+  g_create_overlay_surface_method = env->GetMethodID(
+      g_flutter_jni_class->obj(), "createOverlaySurface", "()V");
 
   if (g_create_overlay_surface_method == nullptr) {
     FML_LOG(ERROR) << "Could not locate createOverlaySurface method";

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

@@ -116,16 +116,15 @@ public void onEndFrame__callsPlatformViewsController() {
   public void createOverlaySurface__callsPlatformViewsController() {
     PlatformViewsController platformViewsController = mock(PlatformViewsController.class);
 
+    // --- Test Setup ---
     FlutterJNI flutterJNI = new FlutterJNI();
     flutterJNI.setPlatformViewsController(platformViewsController);
 
     // --- Execute Test ---
-    flutterJNI.onDisplayOverlaySurface(
-        /*id=*/ 1, /*x=*/ 10, /*y=*/ 20, /*width=*/ 100, /*height=*/ 200);
+    flutterJNI.createOverlaySurface();
 
     // --- Verify Results ---
-    verify(platformViewsController, times(1))
-        .onDisplayOverlaySurface(/*id=*/ 1, /*x=*/ 10, /*y=*/ 20, /*width=*/ 100, /*height=*/ 200);
+    verify(platformViewsController, times(1)).createOverlaySurface();
   }
 }