Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace android.util.log for FLog

Browse Source 
Summary:
We must use FLog instead of android.util.log, this diff moves the current callsites of android.util.log to FLog

changeLog:[internal]

Reviewed By: JoshuaGross

Differential Revision: D19884741

fbshipit-source-id: 300f7d691961aa51f0b525c37da7ae3d64fe5131
This commit is contained in:
David Vacca
2020-02-13 14:43:54 -08:00
committed by Facebook Github Bot
parent bcc62a6d17
commit 2b5283e39f
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+15 -16
View File
@@ -12,7 +12,6 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
import android.content.res.AssetManager;
import android.os.AsyncTask;
import android.util.Log;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
@@ -123,7 +122,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
final NativeModuleRegistry nativeModuleRegistry,
final JSBundleLoader jsBundleLoader,
NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) {
Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstanceImpl");
mHybridData = initHybrid();
@@ -140,7 +139,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
mTraceListener = new JSProfilerTraceListener(this);
Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge");
initializeBridge(
new BridgeCallback(this),
@@ -149,7 +148,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
mNativeModulesQueueThread,
mNativeModuleRegistry.getJavaModules(this),
mNativeModuleRegistry.getCxxModules());
Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
mJavaScriptContextHolder = new JavaScriptContextHolder(getJavaScriptContext());
@@ -253,7 +252,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
@Override
public void runJSBundle() {
Log.d(ReactConstants.TAG, "CatalystInstanceImpl.runJSBundle()");
FLog.d(ReactConstants.TAG, "CatalystInstanceImpl.runJSBundle()");
Assertions.assertCondition(!mJSBundleHasLoaded, "JS bundle was already loaded!");
// incrementPendingJSCalls();
mJSBundleLoader.loadScript(CatalystInstanceImpl.this);
@@ -333,7 +332,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
@Override
@ThreadConfined(UI)
public void destroy() {
Log.d(ReactConstants.TAG, "CatalystInstanceImpl.destroy() start");
FLog.d(ReactConstants.TAG, "CatalystInstanceImpl.destroy() start");
UiThreadUtil.assertOnUiThread();
if (ReactFeatureFlags.useCatalystTeardownV2) {
@@ -345,7 +344,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
@ThreadConfined(UI)
public void destroyV1() {
Log.d(ReactConstants.TAG, "CatalystInstanceImpl.destroyV1() start");
FLog.d(ReactConstants.TAG, "CatalystInstanceImpl.destroyV1() start");
UiThreadUtil.assertOnUiThread();
if (mDestroyed) {
@@ -405,7 +404,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
mHybridData.resetNative();
getReactQueueConfiguration().destroy();
Log.d(
FLog.d(
ReactConstants.TAG,
"CatalystInstanceImpl.destroy() end");
ReactMarker.logMarker(
@@ -430,7 +429,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
*/
@ThreadConfined(UI)
public void destroyV2() {
Log.d(ReactConstants.TAG, "CatalystInstanceImpl.destroyV2() start");
FLog.d(ReactConstants.TAG, "CatalystInstanceImpl.destroyV2() start");
UiThreadUtil.assertOnUiThread();
if (mDestroyed) {
@@ -447,7 +446,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
new Runnable() {
@Override
public void run() {
Log.d("CatalystInstanceImpl", ".destroy on native modules thread");
FLog.d("CatalystInstanceImpl", ".destroy on native modules thread");
mNativeModuleRegistry.notifyJSInstanceDestroy();
// Notifies all JSI modules that they are being destroyed, including the FabricUIManager
@@ -464,7 +463,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
}
mNativeModulesThreadDestructionComplete = true;
Log.d("CatalystInstanceImpl", ".destroy on native modules thread finished");
FLog.d("CatalystInstanceImpl", ".destroy on native modules thread finished");
}
});
@@ -474,14 +473,14 @@ public class CatalystInstanceImpl implements CatalystInstance {
new Runnable() {
@Override
public void run() {
Log.d("CatalystInstanceImpl", ".destroy on JS thread");
FLog.d("CatalystInstanceImpl", ".destroy on JS thread");
// We need to destroy the TurboModuleManager on the JS Thread
if (mTurboModuleManagerJSIModule != null) {
mTurboModuleManagerJSIModule.onCatalystInstanceDestroy();
}
mJSThreadDestructionComplete = true;
Log.d("CatalystInstanceImpl", ".destroy on JS thread finished");
FLog.d("CatalystInstanceImpl", ".destroy on JS thread finished");
}
});
@@ -490,7 +489,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
while (!mNativeModulesThreadDestructionComplete || !mJSThreadDestructionComplete) {
// Never wait here, blocking the UI thread, for more than 100ms
if ((System.currentTimeMillis() - waitStartTime) > 100) {
Log.w(
FLog.w(
ReactConstants.TAG,
"CatalystInstanceImpl.destroy() timed out waiting for Native Modules and JS thread teardown");
break;
@@ -511,7 +510,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
mHybridData.resetNative();
getReactQueueConfiguration().destroy();
Log.d(ReactConstants.TAG, "CatalystInstanceImpl.destroy() end");
FLog.d(ReactConstants.TAG, "CatalystInstanceImpl.destroy() end");
ReactMarker.logMarker(ReactMarkerConstants.DESTROY_CATALYST_INSTANCE_END);
// This is a noop if the listener was not yet registered.
@@ -527,7 +526,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
@VisibleForTesting
@Override
public void initialize() {
Log.d(ReactConstants.TAG, "CatalystInstanceImpl.initialize()");
FLog.d(ReactConstants.TAG, "CatalystInstanceImpl.initialize()");
Assertions.assertCondition(
!mInitialized, "This catalyst instance has already been initialized");
// We assume that the instance manager blocks on running the JS bundle. If