diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index a000a7ebd..0784a6e94 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -304,7 +304,7 @@ public abstract class ReactInstanceManager { return this; } - public Builder setRedBoxHandler(RedBoxHandler redBoxHandler) { + public Builder setRedBoxHandler(@Nullable RedBoxHandler redBoxHandler) { mRedBoxHandler = redBoxHandler; return this; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index 21a025c57..f48d63200 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -113,6 +113,21 @@ public class DevSupportManagerImpl implements DevSupportManager { ReactInstanceDevCommandsHandler reactInstanceCommandsHandler, @Nullable String packagerPathForJSBundleName, boolean enableOnCreate) { + + this(applicationContext, + reactInstanceCommandsHandler, + packagerPathForJSBundleName, + enableOnCreate, + null); + } + + public DevSupportManagerImpl( + Context applicationContext, + ReactInstanceDevCommandsHandler reactInstanceCommandsHandler, + @Nullable String packagerPathForJSBundleName, + boolean enableOnCreate, + @Nullable RedBoxHandler redBoxHandler) { + mReactInstanceCommandsHandler = reactInstanceCommandsHandler; mApplicationContext = applicationContext; mJSAppBundleName = packagerPathForJSBundleName; @@ -154,19 +169,6 @@ public class DevSupportManagerImpl implements DevSupportManager { mDefaultNativeModuleCallExceptionHandler = new DefaultNativeModuleCallExceptionHandler(); setDevSupportEnabled(enableOnCreate); - } - - public DevSupportManagerImpl( - Context applicationContext, - ReactInstanceDevCommandsHandler reactInstanceCommandsHandler, - @Nullable String packagerPathForJSBundleName, - boolean enableOnCreate, - @Nullable RedBoxHandler redBoxHandler) { - - this(applicationContext, - reactInstanceCommandsHandler, - packagerPathForJSBundleName, - enableOnCreate); mRedBoxHandler = redBoxHandler; }