Updated to use DartCallbackCache to lookup callbacks

Author: bkonyi

shell/platform/android/BUILD.gn

@@ -132,6 +132,7 @@ java_library("flutter_shell_java") {
     "io/flutter/util/PathUtils.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",

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

@@ -0,0 +1,23 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.view;
+
+public final class FlutterCallbackInformation {
+  final public String callbackName;
+  final public String callbackClassName;
+  final public String callbackLibraryPath;
+
+  public static FlutterCallbackInformation lookupCallbackInformation(long handle) {
+    return nativeLookupCallbackInformation(handle);
+  }
+
+  private FlutterCallbackInformation(String callbackName, String callbackClassName, String callbackLibraryPath) {
+    this.callbackName = callbackName;
+    this.callbackClassName = callbackClassName;
+    this.callbackLibraryPath = callbackLibraryPath;
+  }
+
+  private static native FlutterCallbackInformation nativeLookupCallbackInformation(long handle);
+}

shell/platform/android/platform_view_android_jni.cc

@@ -15,6 +15,7 @@
 #include "flutter/fml/platform/android/jni_util.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
+#include "flutter/lib/ui/plugins/callback_cache.h"
 #include "flutter/runtime/dart_service_isolate.h"
 #include "flutter/shell/common/run_configuration.h"
 #include "flutter/shell/platform/android/android_external_texture_gl.h"
@@ -43,13 +44,28 @@ bool CheckException(JNIEnv* env) {
 
 }  // anonymous namespace
 
+static fml::jni::ScopedJavaGlobalRef<jclass>* g_flutter_callback_info_class =
+    nullptr;
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_flutter_view_class = nullptr;
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_flutter_native_view_class =
     nullptr;
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_surface_texture_class = nullptr;
 
 // Called By Native
 
+static jmethodID g_flutter_callback_info_constructor = nullptr;
+jobject CreateFlutterCallbackInformation(
+    JNIEnv* env,
+    const std::string& callbackName,
+    const std::string& callbackClassName,
+    const std::string& callbackLibraryPath) {
+  return env->NewObject(g_flutter_callback_info_class->obj(),
+                        g_flutter_callback_info_constructor,
+                        env->NewStringUTF(callbackName.c_str()),
+                        env->NewStringUTF(callbackClassName.c_str()),
+                        env->NewStringUTF(callbackLibraryPath.c_str()));
+}
+
 static jmethodID g_handle_platform_message_method = nullptr;
 void FlutterViewHandlePlatformMessage(JNIEnv* env,
                                       jobject obj,
@@ -278,6 +294,15 @@ static void RunBundleAndSnapshotFromLibrary(
   ANDROID_SHELL_HOLDER->Launch(std::move(config));
 }
 
+static jobject LookupCallbackInformation(JNIEnv* env, jlong handle) {
+  auto cbInfo = blink::DartCallbackCache::GetCallbackInformation(handle);
+  if (cbInfo == nullptr) {
+    return nullptr;
+  }
+  return CreateFlutterCallbackInformation(env, cbInfo->name, cbInfo->class_name,
+                                          cbInfo->library_path);
+}
+
 static void SetViewportMetrics(JNIEnv* env,
                                jobject jcaller,
                                jlong shell_holder,
@@ -504,6 +529,19 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     return false;
   }
 
+  g_flutter_callback_info_class = new fml::jni::ScopedJavaGlobalRef<jclass>(
+      env, env->FindClass("io/flutter/view/FlutterCallbackInformation"));
+  if (g_flutter_callback_info_class->is_null()) {
+    return false;
+  }
+
+  g_flutter_callback_info_constructor = env->GetMethodID(
+      g_flutter_callback_info_class->obj(), "<init>",
+      "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+  if (g_flutter_callback_info_constructor == nullptr) {
+    return false;
+  }
+
   g_flutter_view_class = new fml::jni::ScopedJavaGlobalRef<jclass>(
       env, env->FindClass("io/flutter/view/FlutterView"));
   if (g_flutter_view_class->is_null()) {
@@ -639,6 +677,14 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
       },
   };
 
+  static const JNINativeMethod callback_info_methods[] = {
+      {
+          .name = "nativeLookupCallbackInformation",
+          .signature = "(J)Lio/flutter/view/FlutterCallbackInformation;",
+          .fnPtr = reinterpret_cast<void*>(&shell::LookupCallbackInformation),
+      },
+  };
+
   if (env->RegisterNatives(g_flutter_native_view_class->obj(),
                            native_view_methods,
                            arraysize(native_view_methods)) != 0) {
@@ -650,6 +696,12 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     return false;
   }
 
+  if (env->RegisterNatives(g_flutter_callback_info_class->obj(),
+                           callback_info_methods,
+                           arraysize(callback_info_methods)) != 0) {
+    return false;
+  }
+
   g_handle_platform_message_method =
       env->GetMethodID(g_flutter_native_view_class->obj(),
                        "handlePlatformMessage", "(Ljava/lang/String;[BI)V");

travis/licenses_golden/licenses_flutter

@@ -202,6 +202,7 @@ FILE: ../../../flutter/lib/ui/window/window.h
 FILE: ../../../flutter/shell/common/skia_event_tracer_impl.cc
 FILE: ../../../flutter/shell/platform/android/apk_asset_provider.cc
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONUtil.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterIsolateStartedEvent.java
 FILE: ../../../flutter/shell/platform/darwin/desktop/Info.plist
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Flutter.podspec
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Info.plist
@@ -501,6 +502,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/Platfor
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm