Removed "onStarted" events + hooks

Author: bkonyi

shell/platform/android/BUILD.gn

@@ -133,7 +133,6 @@ java_library("flutter_shell_java") {
     "io/flutter/util/Preconditions.java",
     "io/flutter/view/AccessibilityBridge.java",
     "io/flutter/view/FlutterCallbackInformation.java",
-    "io/flutter/view/FlutterIsolateStartedEvent.java",
     "io/flutter/view/FlutterMain.java",
     "io/flutter/view/FlutterNativeView.java",
     "io/flutter/view/FlutterRunArguments.java",

shell/platform/android/android_shell_holder.cc

@@ -82,6 +82,8 @@ AndroidShellHolder::AndroidShellHolder(
   fxl::RefPtr<fml::TaskRunner> gpu_runner;
   fxl::RefPtr<fml::TaskRunner> ui_runner;
   fxl::RefPtr<fml::TaskRunner> io_runner;
+  fxl::RefPtr<fml::TaskRunner> platform_runner =
+      fml::MessageLoop::GetCurrent().GetTaskRunner();
   if (is_background_view) {
     auto single_task_runner = thread_host_.ui_thread->GetTaskRunner();
     gpu_runner = single_task_runner;
@@ -94,7 +96,7 @@ AndroidShellHolder::AndroidShellHolder(
   }
   blink::TaskRunners task_runners(
       thread_label,                                    // label
-      fml::MessageLoop::GetCurrent().GetTaskRunner(),  // platform
+      platform_runner,                                 // platform
       gpu_runner,                                      // gpu
       ui_runner,                                       // ui
       io_runner                                        // io
@@ -158,19 +160,15 @@ void AndroidShellHolder::Launch(RunConfiguration config) {
 
   shell_->GetTaskRunners().GetUITaskRunner()->PostTask(
       fxl::MakeCopyable([engine = shell_->GetEngine(),  //
-                         config = std::move(config),    //
-                         view = platform_view_.get()    //
+                         config = std::move(config)     //
   ]() mutable {
-        bool success = false;
-        FXL_LOG(INFO) << "Attempting to launch engine configuration...";
+        FML_LOG(INFO) << "Attempting to launch engine configuration...";
         if (!engine || !engine->Run(std::move(config))) {
-          FXL_LOG(ERROR) << "Could not launch engine in configuration.";
+          FML_LOG(ERROR) << "Could not launch engine in configuration.";
         } else {
-          FXL_LOG(INFO) << "Isolate for engine configuration successfully "
+          FML_LOG(INFO) << "Isolate for engine configuration successfully "
                            "started and run.";
-          success = true;
         }
-        view->InvokeOnStartedCallback(success);
       }));
 }
 

shell/platform/android/io/flutter/view/FlutterIsolateStartedEvent.java

@@ -27,7 +27,6 @@ public class FlutterNativeView implements BinaryMessenger {
     private FlutterView mFlutterView;
     private final Context mContext;
     private boolean applicationIsRunning;
-    private FlutterIsolateStartedEvent startedEvent;
 
     public FlutterNativeView(Context context) {
         this(context, false);
@@ -83,7 +82,7 @@ public void runFromBundle(FlutterRunArguments args) {
           throw new AssertionError("An entrypoint must be specified");
         }
       runFromBundleInternal(args.bundlePath, args.entrypoint,
-          args.libraryPath, args.onStartedEvent);
+          args.libraryPath, null);
     }
 
     /**
@@ -97,12 +96,11 @@ public void runFromBundle(String bundlePath, String snapshotOverride, String ent
     }
 
     private void runFromBundleInternal(String bundlePath, String entrypoint,
-        String libraryPath, FlutterIsolateStartedEvent event) {
+        String libraryPath, String snapshotOverride) {
         assertAttached();
         if (applicationIsRunning)
             throw new AssertionError(
                     "This Flutter engine instance is already running an application");
-        startedEvent = event;
         nativeRunBundleAndSnapshotFromLibrary(mNativePlatformView, bundlePath,
             entrypoint, libraryPath, mContext.getResources().getAssets());
 
@@ -224,11 +222,6 @@ private void onFirstFrame() {
         mFlutterView.onFirstFrame();
     }
 
-    private void onStarted(boolean success) {
-        if (startedEvent == null) return;
-        startedEvent.onStarted(success);
-    }
-
     private static native long nativeAttach(FlutterNativeView view, boolean isBackgroundView);
     private static native void nativeDestroy(long nativePlatformViewAndroid);
     private static native void nativeDetach(long nativePlatformViewAndroid);

shell/platform/android/io/flutter/view/FlutterNativeView.java

@@ -12,5 +12,5 @@ public class FlutterRunArguments {
   public String bundlePath;
   public String entrypoint;
   public String libraryPath;
-  public FlutterIsolateStartedEvent onStartedEvent;
+  public String snapshotOverride;
 }

shell/platform/android/io/flutter/view/FlutterRunArguments.java

@@ -138,16 +138,6 @@ void PlatformViewAndroid::InvokePlatformMessageEmptyResponseCallback(
   message_response->CompleteEmpty();
 }
 
-void PlatformViewAndroid::InvokeOnStartedCallback(bool success) {
-  JNIEnv* env = fml::jni::AttachCurrentThread();
-  fml::jni::ScopedJavaLocalRef<jobject> view = java_object_.get(env);
-  if (view.is_null()) {
-    // The Java object died.
-    return;
-  }
-  FlutterViewOnStarted(fml::jni::AttachCurrentThread(), view.obj(), success);
-}
-
 // |shell::PlatformView|
 void PlatformViewAndroid::HandlePlatformMessage(
     fxl::RefPtr<blink::PlatformMessage> message) {

shell/platform/android/platform_view_android.cc

@@ -63,8 +63,6 @@ class PlatformViewAndroid final : public PlatformView {
   void InvokePlatformMessageEmptyResponseCallback(JNIEnv* env,
                                                   jint response_id);
 
-  void InvokeOnStartedCallback(bool success);
-
   void DispatchSemanticsAction(JNIEnv* env,
                                jint id,
                                jint action,

shell/platform/android/platform_view_android.h

@@ -111,12 +111,6 @@ void FlutterViewOnFirstFrame(JNIEnv* env, jobject obj) {
   FXL_CHECK(CheckException(env));
 }
 
-static jmethodID g_on_started_method = nullptr;
-void FlutterViewOnStarted(JNIEnv* env, jobject obj, jboolean success) {
-  env->CallVoidMethod(obj, g_on_started_method, success);
-  FXL_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);
@@ -292,7 +286,7 @@ static void RunBundleAndSnapshotFromLibrary(
   ANDROID_SHELL_HOLDER->Launch(std::move(config));
 }
 
-static jobject LookupCallbackInformation(JNIEnv* env, jlong handle) {
+static jobject LookupCallbackInformation(JNIEnv* env, /* unused */ jobject, jlong handle) {
   auto cbInfo = blink::DartCallbackCache::GetCallbackInformation(handle);
   if (cbInfo == nullptr) {
     return nullptr;
@@ -738,13 +732,6 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     return false;
   }
 
-  g_on_started_method =
-      env->GetMethodID(g_flutter_native_view_class->obj(), "onStarted", "(Z)V");
-
-  if (g_on_started_method == nullptr) {
-    return false;
-  }
-
   g_attach_to_gl_context_method = env->GetMethodID(
       g_surface_texture_class->obj(), "attachToGLContext", "(I)V");
 

shell/platform/android/platform_view_android_jni.cc

@@ -34,8 +34,6 @@ void FlutterViewUpdateCustomAccessibilityActions(JNIEnv* env,
 
 void FlutterViewOnFirstFrame(JNIEnv* env, jobject obj);
 
-void FlutterViewOnStarted(JNIEnv* env, jobject obj, jboolean success);
-
 void SurfaceTextureAttachToGLContext(JNIEnv* env, jobject obj, jint textureId);
 
 void SurfaceTextureUpdateTexImage(JNIEnv* env, jobject obj);