From 983b0a090346676c47e24103f7c48b38652f7f25 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Fri, 29 May 2020 15:44:39 -0700 Subject: [PATCH] Remove logs related to T62192299 Summary: Removing logs related to T62192299 that we don't need anymore. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D21773629 fbshipit-source-id: d16c01f87be3ed7512fe90b6e261b4c7efbd3068 --- .../java/com/facebook/react/ReactInstanceManager.java | 8 +++----- .../src/main/java/com/facebook/react/ReactRootView.java | 2 -- .../com/facebook/react/bridge/CatalystInstanceImpl.java | 3 --- .../react/devsupport/DisabledDevSupportManager.java | 4 ---- ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp | 4 ---- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 63ac2ec11df..b5cd517d068 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -655,9 +655,9 @@ public class ReactInstanceManager { } } - /** Temporary: due to T62192299, log sources of destroy calls. TODO T62192299: delete */ + /** Temporary: due to T67035147, log sources of destroy calls. TODO T67035147: delete */ private void logOnDestroy() { - FLog.e( + FLog.d( TAG, "ReactInstanceManager.destroy called", new RuntimeException("ReactInstanceManager.destroy called")); @@ -669,7 +669,6 @@ public class ReactInstanceManager { UiThreadUtil.assertOnUiThread(); PrinterHolder.getPrinter().logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Destroy"); - // TODO T62192299: remove when investigation is complete logOnDestroy(); if (mHasStartedDestroying) { @@ -1134,8 +1133,7 @@ public class ReactInstanceManager { } private void attachRootViewToInstance(final ReactRoot reactRoot) { - // TODO: downgrade back to FLog.d once T62192299 is resolved. - FLog.e(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()"); + FLog.d(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()"); Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance"); @Nullable diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 6dedbf620f2..f152a30c432 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -523,8 +523,6 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot { mShouldLogContentAppeared = true; - // TODO T62192299: remove this - FLog.e(TAG, "runApplication: call AppRegistry.runApplication"); catalystInstance.getJSModule(AppRegistry.class).runApplication(jsAppModuleName, appParams); } finally { Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE); diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 62cdb8a6cda..bf84f599d74 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -724,9 +724,6 @@ public class CatalystInstanceImpl implements CatalystInstance { } private void onNativeException(Exception e) { - // TODO T62192299: remove this after investigation - FLog.e(ReactConstants.TAG, "CatalystInstanceImpl caught native exception", e); - mNativeModuleCallExceptionHandler.handleException(e); mReactQueueConfiguration .getUIQueueThread() diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java index 5c6331c99b7..df0ca843ba2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java @@ -9,7 +9,6 @@ package com.facebook.react.devsupport; import android.view.View; import androidx.annotation.Nullable; -import com.facebook.common.logging.FLog; import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; @@ -158,9 +157,6 @@ public class DisabledDevSupportManager implements DevSupportManager { @Override public void handleException(Exception e) { - // TODO T62192299: remove this after investigation - FLog.e("DisabledDevSupportManager", "Caught exception", e); - mDefaultNativeModuleCallExceptionHandler.handleException(e); } } diff --git a/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp b/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp index 0f7159f31ee..2af23e9d96c 100644 --- a/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp +++ b/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp @@ -41,16 +41,12 @@ void JReactMarker::logPerfMarker( const char *tag) { switch (markerId) { case ReactMarker::RUN_JS_BUNDLE_START: - LOG(ERROR) << "logMarker RUN_JS_BUNDLE_START"; // TODO T62192299: delete JReactMarker::logMarker("RUN_JS_BUNDLE_START", tag); break; case ReactMarker::RUN_JS_BUNDLE_STOP: - LOG(ERROR) << "logMarker RUN_JS_BUNDLE_END"; // TODO T62192299: delete JReactMarker::logMarker("RUN_JS_BUNDLE_END", tag); break; case ReactMarker::CREATE_REACT_CONTEXT_STOP: - LOG(ERROR) - << "logMarker CREATE_REACT_CONTEXT_END"; // TODO T62192299: delete JReactMarker::logMarker("CREATE_REACT_CONTEXT_END"); break; case ReactMarker::JS_BUNDLE_STRING_CONVERT_START: