diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java index a40bcaca7ba..6a461623e99 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java @@ -47,12 +47,6 @@ public class StateWrapperImpl implements StateWrapper { public native void updateStateWithFailureCallbackImpl( @NonNull NativeMap map, Object self, int updateStateId); - @Override - public void updateState(@NonNull WritableMap map) { - mUpdateStateId++; - updateStateImpl((NativeMap) map); - } - @Override public void updateState(@NonNull WritableMap map, Runnable failureCallback) { mUpdateStateId++; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java index 454fd2bbb7d..f78eedad134 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java @@ -78,8 +78,12 @@ public class FabricViewStateManager { } }; } + @Nullable WritableMap stateUpdate = stateUpdateCallback.getStateUpdate(); + if (stateUpdate == null) { + return; + } stateWrapper.updateState( - stateUpdateCallback.getStateUpdate(), + stateUpdate, // Failure callback - this is run if the updateState call fails failureRunnable); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java index e56a16cd50f..51bbc14349a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java @@ -21,9 +21,6 @@ public interface StateWrapper { */ ReadableNativeMap getState(); - /** Pass a map of values back to the C++ layer. */ - void updateState(WritableMap map); - /** * Pass a map of values back to the C++ layer. /Last/ runnable passed into updateState is called * if an updateState call fails.