react-native 0.66.0-rc.4 → 0.67.0-rc.1

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/jni/JMessageQueueThread.h>
 #include <react/jni/JRuntimeExecutor.h>
+#include <react/jni/JRuntimeScheduler.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/animations/LayoutAnimationDriver.h>
 #include <react/renderer/scheduler/Scheduler.h>
@@ -105,9 +105,9 @@ class Binding : public jni::HybridClass<Binding>,
 
   void installFabricUIManager(
       jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+      jni::alias_ref<JRuntimeScheduler::javaobject> runtimeSchedulerHolder,
       jni::alias_ref<jobject> javaUIManager,
       EventBeatManager *eventBeatManager,
-      jni::alias_ref<JavaMessageQueueThread::javaobject> jsMessageQueueThread,
       ComponentFactory *componentsRegistry,
       jni::alias_ref<jobject> reactNativeConfig);
 
@@ -199,6 +199,8 @@ class Binding : public jni::HybridClass<Binding>,
   bool disablePreallocateViews_{false};
   bool enableFabricLogs_{false};
   bool enableEarlyEventEmitterUpdate_{false};
+  bool disableRevisionCheckForPreallocation_{false};
+  bool enableEventEmitterRawPointer_{false};
 };
 
 } // namespace react

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp

@@ -20,13 +20,26 @@ EventEmitterWrapper::initHybrid(jni::alias_ref<jclass>) {
 
 void EventEmitterWrapper::invokeEvent(
     std::string eventName,
-    NativeMap *payload) {
+    NativeMap *payload,
+    int category) {
+  if (eventEmitterPointer) {
+    eventEmitterPointer->dispatchEvent(
+        std::move(eventName),
+        payload->consume(),
+        EventPriority::AsynchronousBatched,
+        static_cast<RawEvent::Category>(category));
+    return;
+  }
+
   // It is marginal, but possible for this to be constructed without a valid
   // EventEmitter. In those cases, make sure we noop/blackhole events instead of
   // crashing.
   if (eventEmitter != nullptr) {
     eventEmitter->dispatchEvent(
-        eventName, payload->consume(), EventPriority::AsynchronousBatched);
+        eventName,
+        payload->consume(),
+        EventPriority::AsynchronousBatched,
+        static_cast<RawEvent::Category>(category));
   }
 }
 
@@ -34,6 +47,11 @@ void EventEmitterWrapper::invokeUniqueEvent(
     std::string eventName,
     NativeMap *payload,
     int customCoalesceKey) {
+  if (eventEmitterPointer) {
+    eventEmitterPointer->dispatchUniqueEvent(
+        std::move(eventName), payload->consume());
+    return;
+  }
   // TODO: customCoalesceKey currently unused
   // It is marginal, but possible for this to be constructed without a valid
   // EventEmitter. In those cases, make sure we noop/blackhole events instead of

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h

@@ -24,8 +24,9 @@ class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
   static void registerNatives();
 
   SharedEventEmitter eventEmitter;
+  EventEmitter const *eventEmitterPointer;
 
-  void invokeEvent(std::string eventName, NativeMap *params);
+  void invokeEvent(std::string eventName, NativeMap *params, int category);
   void invokeUniqueEvent(
       std::string eventName,
       NativeMap *params,

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java

@@ -13,6 +13,7 @@ import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS;
 import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
 
 import android.os.SystemClock;
+import android.view.View;
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -274,10 +275,17 @@ public class MountItemDispatcher {
           executeOrEnqueue(mountItem);
         } catch (Throwable e) {
           // If there's an exception, we want to log diagnostics in prod and rethrow.
-          FLog.e(TAG, "dispatchMountItems: caught exception, displaying all MountItems", e);
+          FLog.e(TAG, "dispatchMountItems: caught exception, displaying mount state", e);
           for (MountItem m : mountItemsToDispatch) {
             printMountItem(m, "dispatchMountItems: mountItem");
           }
+          if (mountItem.getSurfaceId() != View.NO_ID) {
+            SurfaceMountingManager surfaceManager =
+                mMountingManager.getSurfaceManager(mountItem.getSurfaceId());
+            if (surfaceManager != null) {
+              surfaceManager.printSurfaceState();
+            }
+          }
 
           if (ReactIgnorableMountingException.isIgnorable(e)) {
             ReactSoftExceptionLogger.logSoftException(TAG, e);

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -910,10 +910,6 @@ public class SurfaceMountingManager {
     // We treat this as a perf problem and not a logical error. View Preallocation or unexpected
     // changes to Differ or C++ Binding could cause some redundant Create instructions.
     if (getNullableViewState(reactTag) != null) {
-      ReactSoftExceptionLogger.logSoftException(
-          TAG,
-          new IllegalStateException(
-              "Cannot Preallocate view with tag [" + reactTag + "], already exists."));
       return;
     }
 
@@ -963,6 +959,25 @@ public class SurfaceMountingManager {
     return (ViewGroupManager<ViewGroup>) viewState.mViewManager;
   }
 
+  public void printSurfaceState() {
+    FLog.e(TAG, "Views created for surface {%d}:", getSurfaceId());
+    for (ViewState viewState : mTagToViewState.values()) {
+      String viewManagerName =
+          viewState.mViewManager != null ? viewState.mViewManager.getName() : null;
+      @Nullable View view = viewState.mView;
+      @Nullable View parent = view != null ? (View) view.getParent() : null;
+      @Nullable Integer parentTag = parent != null ? parent.getId() : null;
+
+      FLog.e(
+          TAG,
+          "<%s id=%d parentTag=%s isRoot=%b />",
+          viewManagerName,
+          viewState.mReactTag,
+          parentTag,
+          viewState.mIsRoot);
+    }
+  }
+
   /**
    * This class holds view state for react tags. Objects of this class are stored into the {@link
    * #mTagToViewState}, and they should be updated in the same thread.

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java

@@ -226,8 +226,12 @@ public class IntBufferBatchMountItem implements MountItem {
                     : "<hidden>";
             s.append(String.format("UPDATE PROPS [%d]: %s\n", mIntBuffer[i++], propsString));
           } else if (type == INSTRUCTION_UPDATE_STATE) {
-            j += 1;
-            s.append(String.format("UPDATE STATE [%d]\n", mIntBuffer[i++]));
+            StateWrapper state = castToState(mObjBuffer[j++]);
+            String stateString =
+                IS_DEVELOPMENT_ENVIRONMENT
+                    ? (state != null ? state.getStateData().toString() : "<null>")
+                    : "<hidden>";
+            s.append(String.format("UPDATE STATE [%d]: %s\n", mIntBuffer[i++], stateString));
           } else if (type == INSTRUCTION_UPDATE_LAYOUT) {
             s.append(
                 String.format(

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK

@@ -20,7 +20,8 @@ rn_xplat_cxx_library(
     srcs = glob(["*.cpp"]),
     headers = glob(["*.h"]),
     header_namespace = "",
-    compiler_flags = ["-fexceptions"],
+    compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
+    compiler_flags_enable_rtti = True,  # TODO: is this necessary?
     fbandroid_allow_jni_merging = True,
     platforms = ANDROID,
     soname = "libjscexecutor.$(ext)",

package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.modules.appearance;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import androidx.annotation.Nullable;
@@ -74,7 +75,15 @@ public class AppearanceModule extends NativeAppearanceSpec {
 
   @Override
   public String getColorScheme() {
-    mColorScheme = colorSchemeForCurrentConfiguration(getReactApplicationContext());
+    // Attempt to use the Activity context first in order to get the most up to date
+    // scheme. This covers the scenario when AppCompatDelegate.setDefaultNightMode()
+    // is called directly (which can occur in Brownfield apps for example).
+    Activity activity = getCurrentActivity();
+
+    mColorScheme =
+        colorSchemeForCurrentConfiguration(
+            activity != null ? activity : getReactApplicationContext());
+
     return mColorScheme;
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK

@@ -5,12 +5,6 @@ rn_xplat_cxx_library(
     srcs = glob(["*.cpp"]),
     headers = glob(["*.h"]),
     header_namespace = "",
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     platforms = ANDROID,
     soname = "libreactnativeblob.$(ext)",

package/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "clipboard",
@@ -16,4 +16,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
+    exported_deps = [
+        react_native_root_target(":FBReactNativeSpec"),
+    ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java

@@ -9,17 +9,16 @@ package com.facebook.react.modules.clipboard;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.Context;
-import com.facebook.react.bridge.ContextBaseJavaModule;
+import com.facebook.fbreact.specs.NativeClipboardSpec;
 import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.annotations.ReactModule;
 
 /** A module that allows JS to get/set clipboard contents. */
 @ReactModule(name = ClipboardModule.NAME)
-public class ClipboardModule extends ContextBaseJavaModule {
+public class ClipboardModule extends NativeClipboardSpec {
 
-  public ClipboardModule(Context context) {
+  public ClipboardModule(ReactApplicationContext context) {
     super(context);
   }
 
@@ -31,10 +30,12 @@ public class ClipboardModule extends ContextBaseJavaModule {
   }
 
   private ClipboardManager getClipboardService() {
-    return (ClipboardManager) getContext().getSystemService(getContext().CLIPBOARD_SERVICE);
+    return (ClipboardManager)
+        getReactApplicationContext()
+            .getSystemService(getReactApplicationContext().CLIPBOARD_SERVICE);
   }
 
-  @ReactMethod
+  @Override
   public void getString(Promise promise) {
     try {
       ClipboardManager clipboard = getClipboardService();
@@ -50,7 +51,7 @@ public class ClipboardModule extends ContextBaseJavaModule {
     }
   }
 
-  @ReactMethod
+  @Override
   public void setString(String text) {
     ClipData clipdata = ClipData.newPlainText(null, text);
     ClipboardManager clipboard = getClipboardService();

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java

@@ -65,28 +65,16 @@ public class ExceptionsManagerModule extends NativeExceptionsManagerSpec {
   public void reportException(ReadableMap data) {
     String message = data.hasKey("message") ? data.getString("message") : "";
     ReadableArray stack = data.hasKey("stack") ? data.getArray("stack") : Arguments.createArray();
-    int id = data.hasKey("id") ? data.getInt("id") : -1;
     boolean isFatal = data.hasKey("isFatal") ? data.getBoolean("isFatal") : false;
 
-    if (mDevSupportManager.getDevSupportEnabled()) {
-      boolean suppressRedBox = false;
-      if (data.getMap("extraData") != null && data.getMap("extraData").hasKey("suppressRedBox")) {
-        suppressRedBox = data.getMap("extraData").getBoolean("suppressRedBox");
-      }
-
-      if (!suppressRedBox) {
-        mDevSupportManager.showNewJSError(message, stack, id);
-      }
+    String extraDataAsJson = ExceptionDataHelper.getExtraDataAsJson(data);
+    if (isFatal) {
+      throw new JavascriptException(JSStackTrace.format(message, stack))
+          .setExtraDataAsJson(extraDataAsJson);
     } else {
-      String extraDataAsJson = ExceptionDataHelper.getExtraDataAsJson(data);
-      if (isFatal) {
-        throw new JavascriptException(JSStackTrace.format(message, stack))
-            .setExtraDataAsJson(extraDataAsJson);
-      } else {
-        FLog.e(ReactConstants.TAG, JSStackTrace.format(message, stack));
-        if (extraDataAsJson != null) {
-          FLog.d(ReactConstants.TAG, "extraData: %s", extraDataAsJson);
-        }
+      FLog.e(ReactConstants.TAG, JSStackTrace.format(message, stack));
+      if (extraDataAsJson != null) {
+        FLog.d(ReactConstants.TAG, "extraData: %s", extraDataAsJson);
       }
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/{JavaScriptTimerManager.java → JavaScriptTimerExecutor.java}

@@ -10,7 +10,7 @@ package com.facebook.react.modules.core;
 import com.facebook.react.bridge.WritableArray;
 
 /** An interface used by {@link JavaTimerManager} to access and call JS timers from Java. */
-public interface JavaScriptTimerManager {
+public interface JavaScriptTimerExecutor {
 
   /**
    * Calls the JS callback(s) associated with the timer ID(s). Also unregisters the callback if the

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java

@@ -81,7 +81,7 @@ public class JavaTimerManager {
       }
 
       if (mTimersToCall != null) {
-        mJavaScriptTimerManager.callTimers(mTimersToCall);
+        mJavaScriptTimerExecutor.callTimers(mTimersToCall);
         mTimersToCall = null;
       }
 
@@ -139,7 +139,7 @@ public class JavaTimerManager {
       }
 
       if (sendIdleEvents) {
-        mJavaScriptTimerManager.callIdleCallbacks(absoluteFrameStartTime);
+        mJavaScriptTimerExecutor.callIdleCallbacks(absoluteFrameStartTime);
       }
 
       mCurrentIdleCallbackRunnable = null;
@@ -151,7 +151,7 @@ public class JavaTimerManager {
   }
 
   private final ReactApplicationContext mReactApplicationContext;
-  private final JavaScriptTimerManager mJavaScriptTimerManager;
+  private final JavaScriptTimerExecutor mJavaScriptTimerExecutor;
   private final ReactChoreographer mReactChoreographer;
   private final DevSupportManager mDevSupportManager;
   private final Object mTimerGuard = new Object();
@@ -169,11 +169,11 @@ public class JavaTimerManager {
 
   public JavaTimerManager(
       ReactApplicationContext reactContext,
-      JavaScriptTimerManager javaScriptTimerManager,
+      JavaScriptTimerExecutor javaScriptTimerManager,
       ReactChoreographer reactChoreographer,
       DevSupportManager devSupportManager) {
     mReactApplicationContext = reactContext;
-    mJavaScriptTimerManager = javaScriptTimerManager;
+    mJavaScriptTimerExecutor = javaScriptTimerManager;
     mReactChoreographer = reactChoreographer;
     mDevSupportManager = devSupportManager;
 
@@ -327,7 +327,7 @@ public class JavaTimerManager {
     if (mDevSupportManager.getDevSupportEnabled()) {
       long driftTime = Math.abs(remoteTime - deviceTime);
       if (driftTime > 60000) {
-        mJavaScriptTimerManager.emitTimeDriftWarning(
+        mJavaScriptTimerExecutor.emitTimeDriftWarning(
             "Debugger and device times have drifted by more than 60s. Please correct this by "
                 + "running adb shell \"date `date +%m%d%H%M%Y.%S`\" on your debugger machine.");
       }
@@ -338,7 +338,7 @@ public class JavaTimerManager {
     if (duration == 0 && !repeat) {
       WritableArray timerToCall = Arguments.createArray();
       timerToCall.pushInt(callbackID);
-      mJavaScriptTimerManager.callTimers(timerToCall);
+      mJavaScriptTimerExecutor.callTimers(timerToCall);
       return;
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java

@@ -22,7 +22,7 @@ import com.facebook.react.module.annotations.ReactModule;
 public final class TimingModule extends NativeTimingSpec
     implements LifecycleEventListener, HeadlessJsTaskEventListener {
 
-  public class BridgeTimerManager implements JavaScriptTimerManager {
+  public class BridgeTimerExecutor implements JavaScriptTimerExecutor {
     @Override
     public void callTimers(WritableArray timerIDs) {
       ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
@@ -61,7 +61,7 @@ public final class TimingModule extends NativeTimingSpec
     mJavaTimerManager =
         new JavaTimerManager(
             reactContext,
-            new BridgeTimerManager(),
+            new BridgeTimerExecutor(),
             ReactChoreographer.getInstance(),
             devSupportManager);
   }

package/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java

@@ -8,6 +8,7 @@
 package com.facebook.react.modules.i18nmanager;
 
 import android.content.Context;
+import android.os.Build;
 import com.facebook.fbreact.specs.NativeI18nManagerSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -36,7 +37,12 @@ public class I18nManagerModule extends NativeI18nManagerSpec {
   @Override
   public Map<String, Object> getTypedExportedConstants() {
     final Context context = getReactApplicationContext();
-    final Locale locale = context.getResources().getConfiguration().locale;
+    final Locale locale;
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      locale = context.getResources().getConfiguration().getLocales().get(0);
+    } else {
+      locale = context.getResources().getConfiguration().locale;
+    }
 
     final Map<String, Object> constants = MapBuilder.newHashMap();
     constants.put("isRTL", sharedI18nUtilInstance.isRTL(context));

package/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java

@@ -86,25 +86,8 @@ public class IntentModule extends NativeIntentAndroidSpec {
     }
 
     try {
-      Activity currentActivity = getCurrentActivity();
       Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url).normalizeScheme());
-
-      String selfPackageName = getReactApplicationContext().getPackageName();
-      ComponentName componentName =
-          intent.resolveActivity(getReactApplicationContext().getPackageManager());
-      String otherPackageName = (componentName != null ? componentName.getPackageName() : "");
-
-      // If there is no currentActivity or we are launching to a different package we need to set
-      // the FLAG_ACTIVITY_NEW_TASK flag
-      if (currentActivity == null || !selfPackageName.equals(otherPackageName)) {
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      }
-
-      if (currentActivity != null) {
-        currentActivity.startActivity(intent);
-      } else {
-        getReactApplicationContext().startActivity(intent);
-      }
+      sendOSIntent(intent, false);
 
       promise.resolve(true);
     } catch (Exception e) {
@@ -235,6 +218,27 @@ public class IntentModule extends NativeIntentAndroidSpec {
       }
     }
 
-    getReactApplicationContext().startActivity(intent);
+    sendOSIntent(intent, true);
+  }
+
+  private void sendOSIntent(Intent intent, Boolean useNewTaskFlag) {
+    Activity currentActivity = getCurrentActivity();
+
+    String selfPackageName = getReactApplicationContext().getPackageName();
+    ComponentName componentName =
+        intent.resolveActivity(getReactApplicationContext().getPackageManager());
+    String otherPackageName = (componentName != null ? componentName.getPackageName() : "");
+
+    // If there is no currentActivity or we are launching to a different package we need to set
+    // the FLAG_ACTIVITY_NEW_TASK flag
+    if (useNewTaskFlag || currentActivity == null || !selfPackageName.equals(otherPackageName)) {
+      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
+
+    if (currentActivity != null) {
+      currentActivity.startActivity(intent);
+    } else {
+      getReactApplicationContext().startActivity(intent);
+    }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java

@@ -144,10 +144,7 @@ public class ForwardingCookieHandler extends CookieHandler {
         // specific exception.
         // https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/webkit/WebViewFactory.java#348
         if (message != null
-            && exception
-                .getClass()
-                .getCanonicalName()
-                .equals("android.webkit.WebViewFactory.MissingWebViewPackageException")) {
+            && exception.getClass().getCanonicalName().contains("MissingWebViewPackageException")) {
           return null;
         } else {
           throw exception;

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -16,7 +16,7 @@ import java.util.Map;
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 66,
+      "minor", 67,
       "patch", 0,
-      "prerelease", "rc.4");
+      "prerelease", "rc.1");
 }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java

@@ -41,6 +41,7 @@ public final class ReconnectingWebSocket extends WebSocketListener {
 
   private final String mUrl;
   private final Handler mHandler;
+  private final OkHttpClient mOkHttpClient;
   private boolean mClosed = false;
   private boolean mSuppressConnectionErrors;
   private @Nullable WebSocket mWebSocket;
@@ -56,6 +57,12 @@ public final class ReconnectingWebSocket extends WebSocketListener {
     mMessageCallback = messageCallback;
     mConnectionCallback = connectionCallback;
     mHandler = new Handler(Looper.getMainLooper());
+    mOkHttpClient =
+        new OkHttpClient.Builder()
+            .connectTimeout(10, TimeUnit.SECONDS)
+            .writeTimeout(10, TimeUnit.SECONDS)
+            .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
+            .build();
   }
 
   public void connect() {
@@ -63,15 +70,8 @@ public final class ReconnectingWebSocket extends WebSocketListener {
       throw new IllegalStateException("Can't connect closed client");
     }
 
-    OkHttpClient httpClient =
-        new OkHttpClient.Builder()
-            .connectTimeout(10, TimeUnit.SECONDS)
-            .writeTimeout(10, TimeUnit.SECONDS)
-            .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
-            .build();
-
     Request request = new Request.Builder().url(mUrl).build();
-    httpClient.newWebSocket(request, this);
+    mOkHttpClient.newWebSocket(request, this);
   }
 
   private synchronized void delayedReconnect() {

package/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java

@@ -59,7 +59,7 @@ import javax.lang.model.util.Types;
 /**
  * This annotation processor crawls subclasses of ReactShadowNode and ViewManager and finds their
  * exported properties with the @ReactProp or @ReactGroupProp annotation. It generates a class per
- * shadow node/view manager that is named {@code <classname>$$PropSetter}. This class contains
+ * shadow node/view manager that is named {@code <classname>$$PropsSetter}. This class contains
  * methods to retrieve the name and type of all methods and a way to set these properties without
  * reflection.
  */

package/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK

@@ -9,12 +9,6 @@ rn_xplat_cxx_library(
     exported_headers = {
         "reactperflogger/JNativeModulePerfLogger.h": "reactperflogger/JNativeModulePerfLogger.h",
     },
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbandroid_allow_jni_merging = True,
     fbandroid_labels = [
         "supermodule:xplat/default/public.react_native.infra",

package/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK

@@ -34,7 +34,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/camera:camera"),
         react_native_target("java/com/facebook/react/modules/clipboard:clipboard"),
         react_native_target("java/com/facebook/react/modules/core:core"),
-        react_native_target("java/com/facebook/react/modules/datepicker:datepicker"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
         react_native_target("java/com/facebook/react/modules/dialog:dialog"),
         react_native_target("java/com/facebook/react/modules/fresco:fresco"),

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java

@@ -23,7 +23,6 @@ import com.facebook.react.modules.blob.BlobModule;
 import com.facebook.react.modules.blob.FileReaderModule;
 import com.facebook.react.modules.camera.ImageStoreManager;
 import com.facebook.react.modules.clipboard.ClipboardModule;
-import com.facebook.react.modules.datepicker.DatePickerDialogModule;
 import com.facebook.react.modules.dialog.DialogModule;
 import com.facebook.react.modules.fresco.FrescoModule;
 import com.facebook.react.modules.i18nmanager.I18nManagerModule;
@@ -72,7 +71,6 @@ import java.util.Map;
       FileReaderModule.class,
       AsyncStorageModule.class,
       ClipboardModule.class,
-      DatePickerDialogModule.class,
       DialogModule.class,
       FrescoModule.class,
       I18nManagerModule.class,
@@ -117,8 +115,6 @@ public class MainReactPackage extends TurboReactPackage {
         return new AsyncStorageModule(context);
       case ClipboardModule.NAME:
         return new ClipboardModule(context);
-      case DatePickerDialogModule.FRAGMENT_TAG:
-        return new DatePickerDialogModule(context);
       case DialogModule.NAME:
         return new DialogModule(context);
       case FrescoModule.NAME:
@@ -199,7 +195,6 @@ public class MainReactPackage extends TurboReactPackage {
             FileReaderModule.class,
             AsyncStorageModule.class,
             ClipboardModule.class,
-            DatePickerDialogModule.class,
             DialogModule.class,
             FrescoModule.class,
             I18nManagerModule.class,

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK

@@ -11,12 +11,6 @@ rn_xplat_cxx_library(
         "ReactCommon/TurboModuleManager.h": "ReactCommon/TurboModuleManager.h",
         "ReactCommon/TurboModuleManagerDelegate.h": "ReactCommon/TurboModuleManagerDelegate.h",
     },
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     platforms = ANDROID,
     preprocessor_flags = [
@@ -49,12 +43,6 @@ rn_xplat_cxx_library(
     exported_headers = {
         "ReactCommon/CallInvokerHolder.h": "ReactCommon/CallInvokerHolder.h",
     },
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbandroid_deps = [
         FBJNI_TARGET,
     ],

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java

@@ -155,7 +155,7 @@ public class JSTouchDispatcher {
               mTargetCoordinates[1],
               mTouchEventCoalescingKeyHelper));
     } else if (action == MotionEvent.ACTION_POINTER_UP) {
-      // Exactly onw of the pointers goes up
+      // Exactly one of the pointers goes up
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
               getSurfaceId(),