react-native-tvos 0.75.2-0rc0 → 0.76.0-0rc0

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.kt

@@ -8,7 +8,6 @@
 package com.facebook.react.modules.debug
 
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
-import com.facebook.react.common.LongArray
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener
 
 /**
@@ -19,10 +18,10 @@ import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugL
  */
 internal class DidJSUpdateUiDuringFrameDetector :
     NotThreadSafeBridgeIdleDebugListener, NotThreadSafeViewHierarchyUpdateDebugListener {
-  private val transitionToIdleEvents = LongArray.createWithInitialCapacity(20)
-  private val transitionToBusyEvents = LongArray.createWithInitialCapacity(20)
-  private val viewHierarchyUpdateEnqueuedEvents = LongArray.createWithInitialCapacity(20)
-  private val viewHierarchyUpdateFinishedEvents = LongArray.createWithInitialCapacity(20)
+  private val transitionToIdleEvents = ArrayList<Long>(20)
+  private val transitionToBusyEvents = ArrayList<Long>(20)
+  private val viewHierarchyUpdateEnqueuedEvents = ArrayList<Long>(20)
+  private val viewHierarchyUpdateFinishedEvents = ArrayList<Long>(20)
   @Volatile private var wasIdleAtEndOfLastFrame = true
 
   @Synchronized
@@ -106,53 +105,42 @@ internal class DidJSUpdateUiDuringFrameDetector :
       wasIdleAtEndOfLastFrame
     } else lastIdleTransition > lastBusyTransition
   }
+}
 
-  companion object {
-    private fun hasEventBetweenTimestamps(
-        eventArray: LongArray,
-        startTime: Long,
-        endTime: Long
-    ): Boolean {
-      for (i in 0 until eventArray.size()) {
-        val time = eventArray[i]
-        if (time in startTime until endTime) {
-          return true
-        }
-      }
-      return false
-    }
+private fun hasEventBetweenTimestamps(
+    eventArray: ArrayList<Long>,
+    startTime: Long,
+    endTime: Long
+): Boolean = eventArray.any { time -> time in startTime until endTime }
 
-    private fun getLastEventBetweenTimestamps(
-        eventArray: LongArray,
-        startTime: Long,
-        endTime: Long
-    ): Long {
-      var lastEvent: Long = -1
-      for (i in 0 until eventArray.size()) {
-        val time = eventArray[i]
-        if (time in startTime until endTime) {
-          lastEvent = time
-        } else if (time >= endTime) {
-          break
-        }
-      }
-      return lastEvent
+private fun getLastEventBetweenTimestamps(
+    eventArray: ArrayList<Long>,
+    startTime: Long,
+    endTime: Long
+): Long {
+  var lastEvent: Long = -1
+  for (time in eventArray) {
+    if (time in startTime until endTime) {
+      lastEvent = time
+    } else if (time >= endTime) {
+      break
     }
+  }
+  return lastEvent
+}
 
-    private fun cleanUp(eventArray: LongArray, endTime: Long) {
-      val size = eventArray.size()
-      var indicesToRemove = 0
-      for (i in 0 until size) {
-        if (eventArray[i] < endTime) {
-          indicesToRemove++
-        }
-      }
-      if (indicesToRemove > 0) {
-        for (i in 0 until size - indicesToRemove) {
-          eventArray[i] = eventArray[i + indicesToRemove]
-        }
-        eventArray.dropTail(indicesToRemove)
-      }
+private fun cleanUp(eventArray: ArrayList<Long>, endTime: Long) {
+  val size = eventArray.size
+  var indicesToRemove = 0
+  for (i in 0 until size) {
+    if (eventArray[i] < endTime) {
+      indicesToRemove++
+    }
+  }
+  if (indicesToRemove > 0) {
+    for (i in 0 until size - indicesToRemove) {
+      eventArray[i] = eventArray[i + indicesToRemove]
     }
+    eventArray.dropLast(indicesToRemove)
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.kt

@@ -36,6 +36,8 @@ public interface DeveloperSettings {
   public var isRemoteJSDebugEnabled: Boolean
 
   /** Whether Start Sampling Profiler on App Start is enabled. */
+  @Deprecated(
+      "Legacy sampling profiler is no longer supported - This field will be removed in React Native 0.77")
   public var isStartSamplingProfilerOnInit: Boolean
 
   /** Whether HMR is enabled. */

package/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java

@@ -12,11 +12,20 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
+import android.os.Build;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.fragment.app.DialogFragment;
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.R;
 
 /** A fragment used to display the dialog. */
 @Nullsafe(Nullsafe.Mode.LOCAL)
@@ -66,15 +75,55 @@ public class AlertFragment extends DialogFragment implements DialogInterface.OnC
     return isAppCompat;
   }
 
+  /**
+   * Creates a custom dialog title View that has the role of "Heading" and focusable for
+   * accessibility purposes.
+   *
+   * @returns accessible TextView title
+   */
+  private static View getAccessibleTitle(Context activityContext, String titleText) {
+    LayoutInflater inflater = LayoutInflater.from(activityContext);
+
+    // This layout matches the sizing and styling of AlertDialog's title_template (minus the icon)
+    // since the whole thing gets tossed out when setting a custom title
+    View titleContainer = inflater.inflate(R.layout.alert_title_layout, null);
+
+    TextView accessibleTitle =
+        Assertions.assertNotNull(titleContainer.findViewById(R.id.alert_title));
+    accessibleTitle.setText(titleText);
+    accessibleTitle.setFocusable(true);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      accessibleTitle.setAccessibilityHeading(true);
+    } else {
+      ViewCompat.setAccessibilityDelegate(
+          accessibleTitle,
+          new AccessibilityDelegateCompat() {
+            @Override
+            public void onInitializeAccessibilityNodeInfo(
+                View view, AccessibilityNodeInfoCompat info) {
+              super.onInitializeAccessibilityNodeInfo(accessibleTitle, info);
+              info.setHeading(true);
+            }
+          });
+    }
+
+    return titleContainer;
+  }
+
   /**
    * Creates a dialog compatible only with AppCompat activities. This function should be kept in
    * sync with {@link createAppDialog}.
    */
   private static Dialog createAppCompatDialog(
       Context activityContext, Bundle arguments, DialogInterface.OnClickListener fragment) {
-    AlertDialog.Builder builder =
-        new AlertDialog.Builder(activityContext).setTitle(arguments.getString(ARG_TITLE));
+    AlertDialog.Builder builder = new AlertDialog.Builder(activityContext);
 
+    if (arguments.containsKey(ARG_TITLE)) {
+      String title = Assertions.assertNotNull(arguments.getString(ARG_TITLE));
+      View accessibleTitle = getAccessibleTitle(activityContext, title);
+      builder.setCustomTitle(accessibleTitle);
+    }
     if (arguments.containsKey(ARG_BUTTON_POSITIVE)) {
       builder.setPositiveButton(arguments.getString(ARG_BUTTON_POSITIVE), fragment);
     }
@@ -102,12 +151,16 @@ public class AlertFragment extends DialogFragment implements DialogInterface.OnC
    *
    * @deprecated non-AppCompat dialogs are deprecated and will be removed in a future version.
    */
+  @Deprecated(since = "0.75.0", forRemoval = true)
   private static Dialog createAppDialog(
       Context activityContext, Bundle arguments, DialogInterface.OnClickListener fragment) {
-    android.app.AlertDialog.Builder builder =
-        new android.app.AlertDialog.Builder(activityContext)
-            .setTitle(arguments.getString(ARG_TITLE));
+    android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(activityContext);
 
+    if (arguments.containsKey(ARG_TITLE)) {
+      String title = Assertions.assertNotNull(arguments.getString(ARG_TITLE));
+      View accessibleTitle = getAccessibleTitle(activityContext, title);
+      builder.setCustomTitle(accessibleTitle);
+    }
     if (arguments.containsKey(ARG_BUTTON_POSITIVE)) {
       builder.setPositiveButton(arguments.getString(ARG_BUTTON_POSITIVE), fragment);
     }

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt

@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.fresco
+
+import com.facebook.common.logging.FLog
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory.newBuilder
+import com.facebook.imagepipeline.core.DownsampleMode
+import com.facebook.imagepipeline.core.ImagePipeline
+import com.facebook.imagepipeline.core.ImagePipelineConfig
+import com.facebook.imagepipeline.listener.RequestListener
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.common.ReactConstants
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.modules.common.ModuleDataCleaner
+import com.facebook.react.modules.network.ForwardingCookieHandler
+import com.facebook.react.modules.network.OkHttpClientProvider
+import com.facebook.react.modules.network.OkHttpCompat
+import com.facebook.react.turbomodule.core.interfaces.TurboModule
+import okhttp3.JavaNetCookieJar
+
+/**
+ * Module to initialize the Fresco library.
+ *
+ * Does not expose any methods to JavaScript code. For initialization and cleanup only.
+ */
+@ReactModule(name = FrescoModule.NAME, needsEagerInit = true)
+public open class FrescoModule
+@JvmOverloads
+constructor(
+    reactContext: ReactApplicationContext?,
+    private val clearOnDestroy: Boolean = true,
+    imagePipelineConfig: ImagePipelineConfig? = null
+) :
+    ReactContextBaseJavaModule(reactContext),
+    ModuleDataCleaner.Cleanable,
+    LifecycleEventListener,
+    TurboModule {
+  private var config: ImagePipelineConfig? = imagePipelineConfig
+  private var pipeline: ImagePipeline? = null
+
+  /**
+   * Create a new Fresco module with a default configuration (or the previously given configuration
+   * via [.FrescoModule].
+   *
+   * @param reactContext the context to use
+   * @param imagePipeline the Fresco image pipeline to use
+   * @param clearOnDestroy whether to clear the memory cache in onHostDestroy: this should be `true`
+   *   for pure RN apps and `false` for apps that use Fresco outside of RN as well
+   * @param hasBeenInitializedExternally whether Fresco has already been initialized
+   */
+  @JvmOverloads
+  public constructor(
+      reactContext: ReactApplicationContext?,
+      imagePipeline: ImagePipeline?,
+      clearOnDestroy: Boolean = true,
+      hasBeenInitializedExternally: Boolean = false
+  ) : this(reactContext, clearOnDestroy) {
+    pipeline = imagePipeline
+    if (hasBeenInitializedExternally) {
+      hasBeenInitialized = true
+    }
+  }
+
+  override fun initialize() {
+    super.initialize()
+    val reactContext = reactApplicationContext
+    reactContext.addLifecycleEventListener(this)
+    if (!hasBeenInitialized()) {
+      if (config == null) {
+        config = getDefaultConfig(reactContext)
+      }
+      Fresco.initialize(reactContext.applicationContext, config)
+      hasBeenInitialized = true
+    } else if (config != null) {
+      FLog.w(
+          ReactConstants.TAG,
+          "Fresco has already been initialized with a different config. " +
+              "The new Fresco configuration will be ignored!")
+    }
+    config = null
+  }
+
+  override fun getName(): String = NAME
+
+  override fun clearSensitiveData() {
+    // Clear image cache.
+    imagePipeline?.clearCaches()
+  }
+
+  override fun onHostResume(): Unit = Unit
+
+  override fun onHostPause(): Unit = Unit
+
+  override fun onHostDestroy() {
+    // According to the javadoc for LifecycleEventListener#onHostDestroy, this is only called when
+    // the 'last' ReactActivity is being destroyed, which effectively means the app is being
+    // backgrounded.
+    if (hasBeenInitialized() && clearOnDestroy) {
+      imagePipeline!!.clearMemoryCaches()
+    }
+  }
+
+  private val imagePipeline: ImagePipeline?
+    get() {
+      if (pipeline == null) {
+        pipeline = Fresco.getImagePipeline()
+      }
+      return pipeline
+    }
+
+  override fun invalidate() {
+    reactApplicationContext.removeLifecycleEventListener(this)
+    super.invalidate()
+  }
+
+  public companion object {
+    internal const val NAME = "FrescoModule"
+    private var hasBeenInitialized = false
+
+    /**
+     * Check whether the FrescoModule has already been initialized. If this is the case, Calls to
+     * [.FrescoModule] will ignore the given configuration.
+     *
+     * @return true if this module has already been initialized
+     */
+    @JvmStatic public fun hasBeenInitialized(): Boolean = hasBeenInitialized
+
+    private fun getDefaultConfig(context: ReactContext): ImagePipelineConfig =
+        getDefaultConfigBuilder(context).build()
+
+    /**
+     * Get the default Fresco configuration builder. Allows adding of configuration options in
+     * addition to the default values.
+     *
+     * @return [ImagePipelineConfig.Builder] that has been initialized with default values
+     */
+    @JvmStatic
+    public fun getDefaultConfigBuilder(context: ReactContext): ImagePipelineConfig.Builder {
+      val requestListeners = HashSet<RequestListener>()
+      requestListeners.add(SystraceRequestListener())
+      val client = OkHttpClientProvider.createClient()
+
+      // make sure to forward cookies for any requests via the okHttpClient
+      // so that image requests to endpoints that use cookies still work
+      val container = OkHttpCompat.getCookieJarContainer(client)
+      val handler = ForwardingCookieHandler(context)
+      container.setCookieJar(JavaNetCookieJar(handler))
+      return newBuilder(context.applicationContext, client)
+          .setNetworkFetcher(ReactOkHttpNetworkFetcher(client))
+          .setDownsampleMode(DownsampleMode.AUTO)
+          .setRequestListeners(requestListeners)
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.fresco
+
+import com.facebook.imagepipeline.request.ImageRequest
+import com.facebook.imagepipeline.request.ImageRequestBuilder
+import com.facebook.react.bridge.ReadableMap
+
+/** Extended ImageRequest with request headers */
+public class ReactNetworkImageRequest
+private constructor(
+    builder: ImageRequestBuilder,
+    /** Headers for the request */
+    internal val headers: ReadableMap?
+) : ImageRequest(builder) {
+
+  public companion object {
+    @JvmStatic
+    public fun fromBuilderWithHeaders(
+        builder: ImageRequestBuilder,
+        headers: ReadableMap?
+    ): ReactNetworkImageRequest {
+      return ReactNetworkImageRequest(builder, headers)
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.fresco
+
+import android.os.SystemClock
+import com.facebook.imagepipeline.backends.okhttp3.OkHttpNetworkFetcher
+import com.facebook.imagepipeline.producers.NetworkFetcher
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.modules.network.OkHttpCompat
+import okhttp3.CacheControl
+import okhttp3.OkHttpClient
+import okhttp3.Request
+
+internal class ReactOkHttpNetworkFetcher(private val okHttpClient: OkHttpClient) :
+    OkHttpNetworkFetcher(okHttpClient) {
+  private fun getHeaders(readableMap: ReadableMap?): Map<String, String>? {
+    if (readableMap == null) {
+      return null
+    }
+    val iterator = readableMap.keySetIterator()
+    val map: MutableMap<String, String> = HashMap()
+    while (iterator.hasNextKey()) {
+      val key = iterator.nextKey()
+      readableMap.getString(key)?.let { map[key] = it }
+    }
+    return map
+  }
+
+  override fun fetch(fetchState: OkHttpNetworkFetchState, callback: NetworkFetcher.Callback) {
+    fetchState.submitTime = SystemClock.elapsedRealtime()
+    val uri = fetchState.uri
+    var requestHeaders: Map<String, String>? = null
+    if (fetchState.context.imageRequest is ReactNetworkImageRequest) {
+      val networkImageRequest = fetchState.context.imageRequest as ReactNetworkImageRequest
+      requestHeaders = getHeaders(networkImageRequest.headers)
+    }
+    val headers = OkHttpCompat.getHeadersFromMap(requestHeaders)
+    val request =
+        Request.Builder()
+            .cacheControl(CacheControl.Builder().noStore().build())
+            .url(uri.toString())
+            .headers(headers)
+            .get()
+            .build()
+    fetchWithRequest(fetchState, callback, request)
+  }
+
+  private companion object {
+    private const val TAG = "ReactOkHttpNetworkFetcher"
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.kt

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.fresco
+
+import android.util.Pair
+import com.facebook.imagepipeline.listener.BaseRequestListener
+import com.facebook.imagepipeline.request.ImageRequest
+import com.facebook.systrace.Systrace
+
+/** Logs requests to Systrace */
+public class SystraceRequestListener : BaseRequestListener() {
+  private var currentId: Int = 0
+  private var producerId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
+  private var requestsId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
+
+  override fun onProducerStart(requestId: String, producerName: String) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    val entryName = StringBuilder()
+    entryName.append("FRESCO_PRODUCER_")
+    entryName.append(producerName.replace(':', '_'))
+    val requestPair = Pair.create(currentId, entryName.toString())
+    Systrace.beginAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, requestPair.second, currentId)
+    producerId[requestId] = requestPair
+    currentId++
+  }
+
+  override fun onProducerFinishWithSuccess(
+      requestId: String,
+      producerName: String,
+      extraMap: Map<String, String>?
+  ) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    if (producerId.containsKey(requestId)) {
+      val entry = producerId[requestId]!!
+      Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
+      producerId.remove(requestId)
+    }
+  }
+
+  override fun onProducerFinishWithFailure(
+      requestId: String,
+      producerName: String,
+      t: Throwable,
+      extraMap: Map<String, String>?
+  ) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    if (producerId.containsKey(requestId)) {
+      val entry = producerId[requestId]!!
+      Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
+      producerId.remove(requestId)
+    }
+  }
+
+  override fun onProducerFinishWithCancellation(
+      requestId: String,
+      producerName: String,
+      extraMap: Map<String, String>?
+  ) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    if (producerId.containsKey(requestId)) {
+      val entry = producerId[requestId]!!
+      Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
+      producerId.remove(requestId)
+    }
+  }
+
+  override fun onProducerEvent(requestId: String, producerName: String, eventName: String) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    val entryName = StringBuilder()
+    entryName.append("FRESCO_PRODUCER_EVENT_")
+    entryName.append(requestId.replace(':', '_'))
+    entryName.append("_")
+    entryName.append(producerName.replace(':', '_'))
+    entryName.append("_")
+    entryName.append(eventName.replace(':', '_'))
+    Systrace.traceInstant(
+        Systrace.TRACE_TAG_REACT_FRESCO, entryName.toString(), Systrace.EventScope.THREAD)
+  }
+
+  override fun onRequestStart(
+      request: ImageRequest,
+      callerContext: Any,
+      requestId: String,
+      isPrefetch: Boolean
+  ) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    val entryName = StringBuilder()
+    entryName.append("FRESCO_REQUEST_")
+    entryName.append(request.sourceUri.toString().replace(':', '_'))
+    val requestPair = Pair.create(currentId, entryName.toString())
+    Systrace.beginAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, requestPair.second, currentId)
+    requestsId[requestId] = requestPair
+    currentId++
+  }
+
+  override fun onRequestSuccess(request: ImageRequest, requestId: String, isPrefetch: Boolean) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    if (requestsId.containsKey(requestId)) {
+      val entry = requestsId[requestId]!!
+      Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
+      requestsId.remove(requestId)
+    }
+  }
+
+  override fun onRequestFailure(
+      request: ImageRequest,
+      requestId: String,
+      throwable: Throwable,
+      isPrefetch: Boolean
+  ) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    if (requestsId.containsKey(requestId)) {
+      val entry = requestsId[requestId]!!
+      Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
+      requestsId.remove(requestId)
+    }
+  }
+
+  override fun onRequestCancellation(requestId: String) {
+    if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
+      return
+    }
+    if (requestsId.containsKey(requestId)) {
+      val entry = requestsId[requestId]!!
+      Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
+      requestsId.remove(requestId)
+    }
+  }
+
+  override fun requiresExtraMap(requestId: String): Boolean = false
+}

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

@@ -17,12 +17,8 @@ import com.facebook.react.module.annotations.ReactModule
 public class I18nManagerModule(context: ReactApplicationContext?) : NativeI18nManagerSpec(context) {
   override public fun getTypedExportedConstants(): Map<String, Any> {
     val context = getReactApplicationContext()
-    val locale =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-          context.resources.configuration.locales[0]
-        } else {
-          @Suppress("DEPRECATION") context.resources.configuration.locale
-        }
+    val locale = context.resources.configuration.locales[0]
+        
     return mapOf(
         "isRTL" to I18nUtil.instance.isRTL(context),
         "doLeftAndRightSwapInRTL" to I18nUtil.instance.doLeftAndRightSwapInRTL(context),

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

@@ -9,8 +9,8 @@ package com.facebook.react.modules.i18nmanager
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
+import android.view.View
 import androidx.core.text.TextUtilsCompat
-import androidx.core.view.ViewCompat
 import java.util.Locale
 
 public class I18nUtil private constructor() {
@@ -53,7 +53,8 @@ public class I18nUtil private constructor() {
 
   /** Could be used to test RTL layout with English Used for development and testing purpose */
   private fun isRTLForced(context: Context): Boolean =
-      isPrefSet(context, KEY_FOR_PREFS_FORCERTL, false)
+      isPrefSet(context, KEY_FOR_PREFS_FORCERTL, false) ||
+          System.getProperty("FORCE_RTL_FOR_TESTING", "false").equals("true", ignoreCase = true)
 
   public fun forceRTL(context: Context, forceRTL: Boolean) {
     setPref(context, KEY_FOR_PREFS_FORCERTL, forceRTL)
@@ -63,7 +64,7 @@ public class I18nUtil private constructor() {
     // Check if the current device language is RTL
     get() {
       val directionality = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault())
-      return directionality == ViewCompat.LAYOUT_DIRECTION_RTL
+      return directionality == View.LAYOUT_DIRECTION_RTL
     }
 
   private fun isPrefSet(context: Context, key: String, defaultValue: Boolean): Boolean =