From 9d7f2498f66c12b4fc1fe19d8fe52971c6c7f3b9 Mon Sep 17 00:00:00 2001 From: Aaron Chiu Date: Thu, 9 Feb 2017 20:23:51 -0800 Subject: [PATCH] fix overriding RN Perf markers Reviewed By: fkgozali Differential Revision: D4513000 fbshipit-source-id: c7c24d3c4851f5719d998b4f08c338a73f47875f --- .../main/java/com/facebook/react/bridge/ReactMarker.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java index 81b20dbe3..5d393a991 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java @@ -3,6 +3,7 @@ package com.facebook.react.bridge; import javax.annotation.Nullable; + import com.facebook.proguard.annotations.DoNotStrip; /** * Static class that allows markers to be placed in React code and responded to in a @@ -17,15 +18,17 @@ public class ReactMarker { @Nullable static private MarkerListener sMarkerListener = null; - static public void setMarkerListener(MarkerListener listener) { + public static void setMarkerListener(MarkerListener listener) { + SoftAssertions.assertCondition( + sMarkerListener == null, + "MarkerListener is being overwritten."); sMarkerListener = listener; } @DoNotStrip - static public void logMarker(String name) { + public static void logMarker(String name) { if (sMarkerListener != null) { sMarkerListener.logMarker(name); } } - }