From 73be933d09cc279474102820859b757ba8f9987c Mon Sep 17 00:00:00 2001 From: Aaron Chiu Date: Fri, 8 Jan 2016 20:58:47 -0800 Subject: [PATCH] fix release builds throwing errors / accessing null objects Reviewed By: zjj010104 Differential Revision: D2816705 fb-gh-sync-id: 0873fd26b3b34fb56abf5ed033198f1b1d84057f --- .../react/devsupport/DisabledDevSupportManager.java | 9 ++++++++- .../react/modules/debug/AnimationsDebugModule.java | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) 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 44edbc886..54f5335cd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java @@ -9,6 +9,7 @@ package com.facebook.react.devsupport; +import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.modules.debug.DeveloperSettings; @@ -19,6 +20,12 @@ import com.facebook.react.modules.debug.DeveloperSettings; */ public class DisabledDevSupportManager implements DevSupportManager { + private final DefaultNativeModuleCallExceptionHandler mDefaultNativeModuleCallExceptionHandler; + + public DisabledDevSupportManager() { + mDefaultNativeModuleCallExceptionHandler = new DefaultNativeModuleCallExceptionHandler(); + } + @Override public void showNewJavaError(String message, Throwable e) { @@ -111,6 +118,6 @@ public class DisabledDevSupportManager implements DevSupportManager { @Override public void handleException(Exception e) { - + mDefaultNativeModuleCallExceptionHandler.handleException(e); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java index 6b914aae2..dc9664581 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java @@ -31,7 +31,7 @@ import com.facebook.react.common.ReactConstants; public class AnimationsDebugModule extends ReactContextBaseJavaModule { private @Nullable FpsDebugFrameCallback mFrameCallback; - private final DeveloperSettings mCatalystSettings; + private @Nullable final DeveloperSettings mCatalystSettings; public AnimationsDebugModule( ReactApplicationContext reactContext, @@ -47,7 +47,8 @@ public class AnimationsDebugModule extends ReactContextBaseJavaModule { @ReactMethod public void startRecordingFps() { - if (!mCatalystSettings.isAnimationFpsDebugEnabled()) { + if (mCatalystSettings == null || + !mCatalystSettings.isAnimationFpsDebugEnabled()) { return; }