update imports

Author: cg021

shell/platform/android/BUILD.gn

@@ -150,6 +150,7 @@ android_java_sources = [
   "io/flutter/embedding/engine/FlutterEngineCache.java",
   "io/flutter/embedding/engine/FlutterEnginePluginRegistry.java",
   "io/flutter/embedding/engine/FlutterJNI.java",
+  "io/flutter/embedding/engine/FlutterOverlaySurface.java",
   "io/flutter/embedding/engine/FlutterShellArgs.java",
   "io/flutter/embedding/engine/dart/DartExecutor.java",
   "io/flutter/embedding/engine/dart/DartMessenger.java",

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

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

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

@@ -5,15 +5,17 @@
 package io.flutter.embedding.engine;
 
 import android.view.Surface;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 
 public class FlutterOverlaySurface {
-  // @NonNull
+  @NonNull
   private final Surface surface;
 
   private final long id;
 
-  // @Keep
-  public FlutterOverlaySurface(long id, Surface surface) {
+  @Keep
+  public FlutterOverlaySurface(long id, @NonNull Surface surface) {
     this.id = id;
     this.surface = surface;
   }

shell/platform/android/jni/platform_view_android_jni.h

@@ -146,6 +146,14 @@ class PlatformViewAndroidJNI {
   /// @note       Must be called from the platform thread.
   ///
   virtual void FlutterViewEndFrame() = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Instantiates an overlay surface in hybrid composition.
+  ///
+  ///
+  /// @note       Must be called from the platform thread.
+  ///
+  virtual void FlutterViewCreateOverlaySurface() = 0;
 };
 
 }  // namespace flutter

shell/platform/android/platform_view_android_jni.h

@@ -1,3 +1,4 @@
+  
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

shell/platform/android/platform_view_android_jni_impl.cc

@@ -25,6 +25,8 @@
 #include "flutter/shell/platform/android/apk_asset_provider.h"
 #include "flutter/shell/platform/android/flutter_main.h"
 #include "flutter/shell/platform/android/platform_view_android.h"
+#include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
+#include "flutter/shell/platform/android/platform_view_android_jni.h"
 
 #define ANDROID_SHELL_HOLDER \
   (reinterpret_cast<AndroidShellHolder*>(shell_holder))
@@ -81,35 +83,11 @@ static jmethodID g_on_first_frame_method = nullptr;
 static jmethodID g_on_engine_restart_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;
-
-std::unique_ptr<AndroidFlutterOverlaySurface> FlutterViewCreateOverlaySurface(
-    JNIEnv* env,
-    jobject obj) {
-  jobject joverlay_layer =
-      env->CallObjectMethod(obj, g_create_overlay_surface_method);
-  jlong layer_id = env->CallLongMethod(joverlay_layer,
-                                       g_flutter_overlay_layer_get_id_method);
-  jobject surface = env->CallObjectMethod(
-      joverlay_layer, g_flutter_overlay_layer_get_surface_method);
-
-  FML_CHECK(CheckException(env));
-  return std::make_unique<AndroidFlutterOverlaySurface>(
-      layer_id, fml::MakeRefCounted<AndroidNativeWindow>(
-                    ANativeWindow_fromSurface(env, surface)));
-}
 
 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;
-
 static jmethodID g_attach_to_gl_context_method = nullptr;
 
 static jmethodID g_update_tex_image_method = nullptr;