diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleLogger.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleLogger.java deleted file mode 100644 index 535b71ee3..000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleLogger.java +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2004-present Facebook. All Rights Reserved. - -package com.facebook.react.bridge; - -/** - * Interface on native modules for the bridge to call for TTI start and end markers. - */ -public interface NativeModuleLogger { - - void startConstantsMapConversion(); - void endConstantsMapConversion(); -} diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java index 5f9eaae2f..996ef7e4f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java @@ -66,4 +66,6 @@ public class ReactMarkerConstants { public static final String ON_HOST_RESUME_END = "ON_HOST_RESUME_END"; public static final String ON_HOST_PAUSE_START = "ON_HOST_PAUSE_START"; public static final String ON_HOST_PAUSE_END = "ON_HOST_PAUSE_END"; + public static final String CONVERT_CONSTANTS_START = "CONVERT_CONSTANTS_START"; + public static final String CONVERT_CONSTANTS_END = "CONVERT_CONSTANTS_END"; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java index eda5c2312..e0e07af6b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java @@ -19,7 +19,6 @@ import com.facebook.react.bridge.BaseJavaModule; import com.facebook.react.bridge.CatalystInstance; import com.facebook.react.bridge.ExecutorToken; import com.facebook.react.bridge.NativeArray; -import com.facebook.react.bridge.NativeModuleLogger; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactMarker; import com.facebook.react.bridge.ReadableNativeArray; @@ -28,6 +27,8 @@ import com.facebook.react.bridge.WritableNativeMap; import com.facebook.systrace.Systrace; import com.facebook.systrace.SystraceMessage; +import static com.facebook.react.bridge.ReactMarkerConstants.CONVERT_CONSTANTS_END; +import static com.facebook.react.bridge.ReactMarkerConstants.CONVERT_CONSTANTS_START; import static com.facebook.react.bridge.ReactMarkerConstants.GET_CONSTANTS_END; import static com.facebook.react.bridge.ReactMarkerConstants.GET_CONSTANTS_START; import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; @@ -109,9 +110,7 @@ public class JavaModuleWrapper { SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "WritableNativeMap constants") .arg("moduleName", getName()) .flush(); - if (baseJavaModule instanceof NativeModuleLogger) { - ((NativeModuleLogger) baseJavaModule).startConstantsMapConversion(); - } + ReactMarker.logMarker(CONVERT_CONSTANTS_START, getName()); WritableNativeMap writableNativeMap; try { writableNativeMap = Arguments.makeNativeMap(map); @@ -120,9 +119,7 @@ public class JavaModuleWrapper { } WritableNativeArray array = new WritableNativeArray(); array.pushMap(writableNativeMap); - if (baseJavaModule instanceof NativeModuleLogger) { - ((NativeModuleLogger) baseJavaModule).endConstantsMapConversion(); - } + ReactMarker.logMarker(CONVERT_CONSTANTS_END); ReactMarker.logMarker(GET_CONSTANTS_END); return array; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java index 1d05aa267..725554596 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java @@ -1,4 +1,4 @@ - /** +/** * Copyright (c) 2015-present, Facebook, Inc. * All rights reserved. * @@ -23,7 +23,6 @@ import com.facebook.react.animation.Animation; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.GuardedRunnable; import com.facebook.react.bridge.LifecycleEventListener; -import com.facebook.react.bridge.NativeModuleLogger; import com.facebook.react.bridge.OnBatchCompleteListener; import com.facebook.react.bridge.PerformanceCounter; import com.facebook.react.bridge.ReactApplicationContext; @@ -43,8 +42,6 @@ import com.facebook.systrace.SystraceMessage; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_END; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_START; -import static com.facebook.react.bridge.ReactMarkerConstants.UI_MANAGER_MODULE_CONSTANTS_CONVERT_END; -import static com.facebook.react.bridge.ReactMarkerConstants.UI_MANAGER_MODULE_CONSTANTS_CONVERT_START; /** *
Native module to allow JS to create and update native Views.
@@ -77,7 +74,7 @@ import static com.facebook.react.bridge.ReactMarkerConstants.UI_MANAGER_MODULE_C */ @ReactModule(name = UIManagerModule.NAME) public class UIManagerModule extends ReactContextBaseJavaModule implements - OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter, NativeModuleLogger { + OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter { protected static final String NAME = "UIManager"; @@ -596,16 +593,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule implements return mUIImplementation.resolveRootTagFromReactTag(reactTag); } - @Override - public void startConstantsMapConversion() { - ReactMarker.logMarker(UI_MANAGER_MODULE_CONSTANTS_CONVERT_START); - } - - @Override - public void endConstantsMapConversion() { - ReactMarker.logMarker(UI_MANAGER_MODULE_CONSTANTS_CONVERT_END); - } - /** * Listener that drops the CSSNode pool on low memory when the app is backgrounded. */