From 8e3105dbcecd9b7c400cff031c22ecd74719704d Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Tue, 1 May 2018 13:02:32 -0700 Subject: [PATCH] Add `getName()` method Summary: adds a `getName()` method to all `JavaScriptExecutor` classes that can be used by `ReactInstanceManager` to identify the bridge type when logging markers. Reviewed By: fromcelticpark Differential Revision: D7790531 fbshipit-source-id: efe485588738a38936accc4a7956840784b2dd08 --- .../com/facebook/react/bridge/JSCJavaScriptExecutor.java | 6 ++++++ .../java/com/facebook/react/bridge/JavaScriptExecutor.java | 5 +++++ .../com/facebook/react/bridge/ProxyJavaScriptExecutor.java | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java index ee77eda70..ead9806f5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java @@ -20,5 +20,11 @@ import com.facebook.proguard.annotations.DoNotStrip; super(initHybrid(jscConfig)); } + @Override + public String getName() { + return "JSCJavaScriptExecutor"; + } + + private native static HybridData initHybrid(ReadableNativeMap jscConfig); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java index e4195aff3..9c72fd1f8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java @@ -26,4 +26,9 @@ public abstract class JavaScriptExecutor { public void close() { mHybridData.resetNative(); } + + /** + * Returns the name of the executor, identifying the underlying runtime. + */ + abstract public String getName(); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java index db04655d3..5442daa3a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java @@ -59,5 +59,10 @@ public class ProxyJavaScriptExecutor extends JavaScriptExecutor { } } + @Override + public String getName() { + return "ProxyJavaScriptExecutor"; + } + private native static HybridData initHybrid(JavaJSExecutor executor); }