react-native-tvos 0.71.13-1 → 0.72.4-0

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

@@ -23,7 +23,6 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.StandardCharsets;
 import com.facebook.react.common.network.OkHttpCallUtil;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -51,7 +50,7 @@ import okio.GzipSource;
 import okio.Okio;
 
 /** Implements the XMLHttpRequest JavaScript interface. */
-@ReactModule(name = NetworkingModule.NAME)
+@ReactModule(name = NativeNetworkingAndroidSpec.NAME)
 public final class NetworkingModule extends NativeNetworkingAndroidSpec {
 
   /**
@@ -84,9 +83,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     WritableMap toResponseData(ResponseBody body) throws IOException;
   }
 
-  public static final String NAME = "Networking";
-
-  private static final String TAG = "NetworkingModule";
+  private static final String TAG = NativeNetworkingAndroidSpec.NAME;
   private static final String CONTENT_ENCODING_HEADER_NAME = "content-encoding";
   private static final String CONTENT_TYPE_HEADER_NAME = "content-type";
   private static final String REQUEST_BODY_KEY_STRING = "string";
@@ -109,7 +106,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
   private final List<ResponseHandler> mResponseHandlers = new ArrayList<>();
   private boolean mShuttingDown;
 
-  /* package */ NetworkingModule(
+  public NetworkingModule(
       ReactApplicationContext reactContext,
       @Nullable String defaultUserAgent,
       OkHttpClient client,
@@ -185,11 +182,6 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     mCookieJarContainer.setCookieJar(new JavaNetCookieJar(mCookieHandler));
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   @Override
   public void invalidate() {
     mShuttingDown = true;
@@ -253,10 +245,9 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
           withCredentials);
     } catch (Throwable th) {
       FLog.e(TAG, "Failed to send url request: " + url, th);
-      final RCTDeviceEventEmitter eventEmitter = getEventEmitter("sendRequest error");
-      if (eventEmitter != null) {
-        ResponseUtil.onRequestError(eventEmitter, requestId, th.getMessage(), th);
-      }
+
+      ResponseUtil.onRequestError(
+          getReactApplicationContextIfActiveOrWarn(), requestId, th.getMessage(), th);
     }
   }
 
@@ -271,8 +262,8 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
       final boolean useIncrementalUpdates,
       int timeout,
       boolean withCredentials) {
-    final RCTDeviceEventEmitter eventEmitter = getEventEmitter("sendRequestInternal");
-
+    final ReactApplicationContext reactApplicationContext =
+        getReactApplicationContextIfActiveOrWarn();
     try {
       Uri uri = Uri.parse(url);
 
@@ -280,13 +271,13 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
       for (UriHandler handler : mUriHandlers) {
         if (handler.supports(uri, responseType)) {
           WritableMap res = handler.fetch(uri);
-          ResponseUtil.onDataReceived(eventEmitter, requestId, res);
-          ResponseUtil.onRequestSuccess(eventEmitter, requestId);
+          ResponseUtil.onDataReceived(reactApplicationContext, requestId, res);
+          ResponseUtil.onRequestSuccess(reactApplicationContext, requestId);
           return;
         }
       }
     } catch (IOException e) {
-      ResponseUtil.onRequestError(eventEmitter, requestId, e.getMessage(), e);
+      ResponseUtil.onRequestError(reactApplicationContext, requestId, e.getMessage(), e);
       return;
     }
 
@@ -294,7 +285,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     try {
       requestBuilder = new Request.Builder().url(url);
     } catch (Exception e) {
-      ResponseUtil.onRequestError(eventEmitter, requestId, e.getMessage(), null);
+      ResponseUtil.onRequestError(reactApplicationContext, requestId, e.getMessage(), null);
       return;
     }
 
@@ -338,7 +329,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
                             return;
                           }
                           ResponseUtil.onDataReceivedProgress(
-                              eventEmitter, requestId, bytesWritten, contentLength);
+                              reactApplicationContext, requestId, bytesWritten, contentLength);
                           last = now;
                         }
                       });
@@ -358,7 +349,8 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
 
     Headers requestHeaders = extractHeaders(headers, data);
     if (requestHeaders == null) {
-      ResponseUtil.onRequestError(eventEmitter, requestId, "Unrecognized headers format", null);
+      ResponseUtil.onRequestError(
+          reactApplicationContext, requestId, "Unrecognized headers format", null);
       return;
     }
     String contentType = requestHeaders.get(CONTENT_TYPE_HEADER_NAME);
@@ -386,7 +378,10 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     } else if (data.hasKey(REQUEST_BODY_KEY_STRING)) {
       if (contentType == null) {
         ResponseUtil.onRequestError(
-            eventEmitter, requestId, "Payload is set but no content-type header specified", null);
+            reactApplicationContext,
+            requestId,
+            "Payload is set but no content-type header specified",
+            null);
         return;
       }
       String body = data.getString(REQUEST_BODY_KEY_STRING);
@@ -394,7 +389,8 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
       if (RequestBodyUtil.isGzipEncoding(contentEncoding)) {
         requestBody = RequestBodyUtil.createGzip(contentMediaType, body);
         if (requestBody == null) {
-          ResponseUtil.onRequestError(eventEmitter, requestId, "Failed to gzip request body", null);
+          ResponseUtil.onRequestError(
+              reactApplicationContext, requestId, "Failed to gzip request body", null);
           return;
         }
       } else {
@@ -410,7 +406,10 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     } else if (data.hasKey(REQUEST_BODY_KEY_BASE64)) {
       if (contentType == null) {
         ResponseUtil.onRequestError(
-            eventEmitter, requestId, "Payload is set but no content-type header specified", null);
+            reactApplicationContext,
+            requestId,
+            "Payload is set but no content-type header specified",
+            null);
         return;
       }
       String base64String = data.getString(REQUEST_BODY_KEY_BASE64);
@@ -419,7 +418,10 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     } else if (data.hasKey(REQUEST_BODY_KEY_URI)) {
       if (contentType == null) {
         ResponseUtil.onRequestError(
-            eventEmitter, requestId, "Payload is set but no content-type header specified", null);
+            reactApplicationContext,
+            requestId,
+            "Payload is set but no content-type header specified",
+            null);
         return;
       }
       String uri = data.getString(REQUEST_BODY_KEY_URI);
@@ -427,7 +429,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
           RequestBodyUtil.getFileInputStream(getReactApplicationContext(), uri);
       if (fileInputStream == null) {
         ResponseUtil.onRequestError(
-            eventEmitter, requestId, "Could not retrieve file for uri " + uri, null);
+            reactApplicationContext, requestId, "Could not retrieve file for uri " + uri, null);
         return;
       }
       requestBody = RequestBodyUtil.create(MediaType.parse(contentType), fileInputStream);
@@ -447,8 +449,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
       requestBody = RequestBodyUtil.getEmptyBody(method);
     }
 
-    requestBuilder.method(
-        method, wrapRequestBodyWithProgressEmitter(requestBody, eventEmitter, requestId));
+    requestBuilder.method(method, wrapRequestBodyWithProgressEmitter(requestBody, requestId));
 
     addRequest(requestId);
     client
@@ -465,7 +466,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
                     e.getMessage() != null
                         ? e.getMessage()
                         : "Error while executing request: " + e.getClass().getSimpleName();
-                ResponseUtil.onRequestError(eventEmitter, requestId, errorMessage, e);
+                ResponseUtil.onRequestError(reactApplicationContext, requestId, errorMessage, e);
               }
 
               @Override
@@ -476,7 +477,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
                 removeRequest(requestId);
                 // Before we touch the body send headers to JS
                 ResponseUtil.onResponseReceived(
-                    eventEmitter,
+                    reactApplicationContext,
                     requestId,
                     response.code(),
                     translateHeaders(response.headers()),
@@ -513,8 +514,8 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
                   for (ResponseHandler handler : mResponseHandlers) {
                     if (handler.supports(responseType)) {
                       WritableMap res = handler.toResponseData(responseBody);
-                      ResponseUtil.onDataReceived(eventEmitter, requestId, res);
-                      ResponseUtil.onRequestSuccess(eventEmitter, requestId);
+                      ResponseUtil.onDataReceived(reactApplicationContext, requestId, res);
+                      ResponseUtil.onRequestSuccess(reactApplicationContext, requestId);
                       return;
                     }
                   }
@@ -523,8 +524,8 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
                   // response,
                   // periodically send response data updates to JS.
                   if (useIncrementalUpdates && responseType.equals("text")) {
-                    readWithProgress(eventEmitter, requestId, responseBody);
-                    ResponseUtil.onRequestSuccess(eventEmitter, requestId);
+                    readWithProgress(requestId, responseBody);
+                    ResponseUtil.onRequestSuccess(reactApplicationContext, requestId);
                     return;
                   }
 
@@ -541,28 +542,30 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
                         // Javascript layer.
                         // Introduced to fix issue #7463.
                       } else {
-                        ResponseUtil.onRequestError(eventEmitter, requestId, e.getMessage(), e);
+                        ResponseUtil.onRequestError(
+                            reactApplicationContext, requestId, e.getMessage(), e);
                       }
                     }
                   } else if (responseType.equals("base64")) {
                     responseString = Base64.encodeToString(responseBody.bytes(), Base64.NO_WRAP);
                   }
-                  ResponseUtil.onDataReceived(eventEmitter, requestId, responseString);
-                  ResponseUtil.onRequestSuccess(eventEmitter, requestId);
+                  ResponseUtil.onDataReceived(reactApplicationContext, requestId, responseString);
+                  ResponseUtil.onRequestSuccess(reactApplicationContext, requestId);
                 } catch (IOException e) {
-                  ResponseUtil.onRequestError(eventEmitter, requestId, e.getMessage(), e);
+                  ResponseUtil.onRequestError(
+                      reactApplicationContext, requestId, e.getMessage(), e);
                 }
               }
             });
   }
 
   private RequestBody wrapRequestBodyWithProgressEmitter(
-      final RequestBody requestBody,
-      final RCTDeviceEventEmitter eventEmitter,
-      final int requestId) {
+      final RequestBody requestBody, final int requestId) {
     if (requestBody == null) {
       return null;
     }
+    final ReactApplicationContext reactApplicationContext =
+        getReactApplicationContextIfActiveOrWarn();
     return RequestBodyUtil.createProgressRequest(
         requestBody,
         new ProgressListener() {
@@ -572,16 +575,15 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
           public void onProgress(long bytesWritten, long contentLength, boolean done) {
             long now = System.nanoTime();
             if (done || shouldDispatch(now, last)) {
-              ResponseUtil.onDataSend(eventEmitter, requestId, bytesWritten, contentLength);
+              ResponseUtil.onDataSend(
+                  reactApplicationContext, requestId, bytesWritten, contentLength);
               last = now;
             }
           }
         });
   }
 
-  private void readWithProgress(
-      RCTDeviceEventEmitter eventEmitter, int requestId, ResponseBody responseBody)
-      throws IOException {
+  private void readWithProgress(int requestId, ResponseBody responseBody) throws IOException {
     long totalBytesRead = -1;
     long contentLength = -1;
     try {
@@ -602,9 +604,11 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
     try {
       byte[] buffer = new byte[MAX_CHUNK_SIZE_BETWEEN_FLUSHES];
       int read;
+      final ReactApplicationContext reactApplicationContext =
+          getReactApplicationContextIfActiveOrWarn();
       while ((read = inputStream.read(buffer)) != -1) {
         ResponseUtil.onIncrementalDataReceived(
-            eventEmitter,
+            reactApplicationContext,
             requestId,
             streamDecoder.decodeNext(buffer, read),
             totalBytesRead,
@@ -680,10 +684,12 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
 
   private @Nullable MultipartBody.Builder constructMultipartBody(
       ReadableArray body, String contentType, int requestId) {
-    RCTDeviceEventEmitter eventEmitter = getEventEmitter("constructMultipartBody");
     MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
     multipartBuilder.setType(MediaType.parse(contentType));
 
+    final ReactApplicationContext reactApplicationContext =
+        getReactApplicationContextIfActiveOrWarn();
+
     for (int i = 0, size = body.size(); i < size; i++) {
       ReadableMap bodyPart = body.getMap(i);
 
@@ -692,7 +698,10 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
       Headers headers = extractHeaders(headersArray, null);
       if (headers == null) {
         ResponseUtil.onRequestError(
-            eventEmitter, requestId, "Missing or invalid header format for FormData part.", null);
+            reactApplicationContext,
+            requestId,
+            "Missing or invalid header format for FormData part.",
+            null);
         return null;
       }
       MediaType partContentType = null;
@@ -710,7 +719,10 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
       } else if (bodyPart.hasKey(REQUEST_BODY_KEY_URI)) {
         if (partContentType == null) {
           ResponseUtil.onRequestError(
-              eventEmitter, requestId, "Binary FormData part needs a content-type header.", null);
+              reactApplicationContext,
+              requestId,
+              "Binary FormData part needs a content-type header.",
+              null);
           return null;
         }
         String fileContentUriStr = bodyPart.getString(REQUEST_BODY_KEY_URI);
@@ -718,7 +730,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
             RequestBodyUtil.getFileInputStream(getReactApplicationContext(), fileContentUriStr);
         if (fileInputStream == null) {
           ResponseUtil.onRequestError(
-              eventEmitter,
+              reactApplicationContext,
               requestId,
               "Could not retrieve file for uri " + fileContentUriStr,
               null);
@@ -726,7 +738,8 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
         }
         multipartBuilder.addPart(headers, RequestBodyUtil.create(partContentType, fileInputStream));
       } else {
-        ResponseUtil.onRequestError(eventEmitter, requestId, "Unrecognized FormData part.", null);
+        ResponseUtil.onRequestError(
+            reactApplicationContext, requestId, "Unrecognized FormData part.", null);
       }
     }
     return multipartBuilder;
@@ -765,14 +778,4 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec {
 
     return headersBuilder.build();
   }
-
-  private RCTDeviceEventEmitter getEventEmitter(String reason) {
-    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-
-    if (reactApplicationContext != null) {
-      return getReactApplicationContext().getJSModule(RCTDeviceEventEmitter.class);
-    }
-
-    return null;
-  }
 }

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

@@ -29,7 +29,6 @@ import java.nio.channels.ReadableByteChannel;
 import java.util.zip.GZIPOutputStream;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
-import okhttp3.internal.Util;
 import okio.BufferedSink;
 import okio.ByteString;
 import okio.Okio;
@@ -122,6 +121,21 @@ import okio.Source;
     return RequestBody.create(mediaType, gzipByteArrayOutputStream.toByteArray());
   }
 
+  /**
+   * Reference:
+   * https://github.com/square/okhttp/blob/8c8c3dbcfa91e28de2e13975ec414e07f153fde4/okhttp/src/commonMain/kotlin/okhttp3/internal/-UtilCommon.kt#L281-L288
+   * Checked exceptions will be ignored
+   */
+  private static void closeQuietly(Source source) {
+    try {
+      source.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      // noop.
+    }
+  }
+
   /** Creates a RequestBody from a mediaType and inputStream given. */
   public static RequestBody create(final MediaType mediaType, final InputStream inputStream) {
     return new RequestBody() {
@@ -146,7 +160,7 @@ import okio.Source;
           source = Okio.source(inputStream);
           sink.writeAll(source);
         } finally {
-          Util.closeQuietly(source);
+          closeQuietly(source);
         }
       }
     };

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

@@ -9,26 +9,26 @@ package com.facebook.react.modules.network;
 
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 import java.net.SocketTimeoutException;
 
 /** Util methods to send network responses to JS. */
 public class ResponseUtil {
   public static void onDataSend(
-      @Nullable RCTDeviceEventEmitter eventEmitter, int requestId, long progress, long total) {
+      @Nullable ReactApplicationContext reactContext, int requestId, long progress, long total) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);
     args.pushInt((int) progress);
     args.pushInt((int) total);
-    if (eventEmitter != null) {
-      eventEmitter.emit("didSendNetworkData", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didSendNetworkData", args);
     }
   }
 
   public static void onIncrementalDataReceived(
-      @Nullable RCTDeviceEventEmitter eventEmitter,
+      @Nullable ReactApplicationContext reactContext,
       int requestId,
       String data,
       long progress,
@@ -39,47 +39,47 @@ public class ResponseUtil {
     args.pushInt((int) progress);
     args.pushInt((int) total);
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didReceiveNetworkIncrementalData", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didReceiveNetworkIncrementalData", args);
     }
   }
 
   public static void onDataReceivedProgress(
-      @Nullable RCTDeviceEventEmitter eventEmitter, int requestId, long progress, long total) {
+      @Nullable ReactApplicationContext reactContext, int requestId, long progress, long total) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);
     args.pushInt((int) progress);
     args.pushInt((int) total);
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didReceiveNetworkDataProgress", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didReceiveNetworkDataProgress", args);
     }
   }
 
   public static void onDataReceived(
-      @Nullable RCTDeviceEventEmitter eventEmitter, int requestId, String data) {
+      @Nullable ReactApplicationContext reactContext, int requestId, String data) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);
     args.pushString(data);
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didReceiveNetworkData", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didReceiveNetworkData", args);
     }
   }
 
   public static void onDataReceived(
-      @Nullable RCTDeviceEventEmitter eventEmitter, int requestId, WritableMap data) {
+      @Nullable ReactApplicationContext reactContext, int requestId, WritableMap data) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);
     args.pushMap(data);
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didReceiveNetworkData", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didReceiveNetworkData", args);
     }
   }
 
   public static void onRequestError(
-      @Nullable RCTDeviceEventEmitter eventEmitter, int requestId, String error, Throwable e) {
+      @Nullable ReactApplicationContext reactContext, int requestId, String error, Throwable e) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);
     args.pushString(error);
@@ -88,23 +88,24 @@ public class ResponseUtil {
       args.pushBoolean(true); // last argument is a time out boolean
     }
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didCompleteNetworkResponse", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didCompleteNetworkResponse", args);
     }
   }
 
-  public static void onRequestSuccess(@Nullable RCTDeviceEventEmitter eventEmitter, int requestId) {
+  public static void onRequestSuccess(
+      @Nullable ReactApplicationContext reactContext, int requestId) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);
     args.pushNull();
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didCompleteNetworkResponse", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didCompleteNetworkResponse", args);
     }
   }
 
   public static void onResponseReceived(
-      @Nullable RCTDeviceEventEmitter eventEmitter,
+      @Nullable ReactApplicationContext reactContext,
       int requestId,
       int statusCode,
       WritableMap headers,
@@ -115,8 +116,8 @@ public class ResponseUtil {
     args.pushMap(headers);
     args.pushString(url);
 
-    if (eventEmitter != null) {
-      eventEmitter.emit("didReceiveNetworkResponse", args);
+    if (reactContext != null) {
+      reactContext.emitDeviceEvent("didReceiveNetworkResponse", args);
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java

@@ -26,11 +26,10 @@ import com.facebook.react.modules.core.PermissionListener;
 import java.util.ArrayList;
 
 /** Module that exposes the Android M Permission system to JS. */
-@ReactModule(name = PermissionsModule.NAME)
+@ReactModule(name = NativePermissionsAndroidSpec.NAME)
 public class PermissionsModule extends NativePermissionsAndroidSpec implements PermissionListener {
 
   private static final String ERROR_INVALID_ACTIVITY = "E_INVALID_ACTIVITY";
-  public static final String NAME = "PermissionsAndroid";
   private final SparseArray<Callback> mCallbacks;
   private int mRequestCode = 0;
   private final String GRANTED = "granted";
@@ -42,11 +41,6 @@ public class PermissionsModule extends NativePermissionsAndroidSpec implements P
     mCallbacks = new SparseArray<Callback>();
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   /**
    * Check if the app has the permission given. successCallback is called with true if the
    * permission had been granted, false otherwise. See {@link Activity#checkSelfPermission}.

package/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java

@@ -18,10 +18,9 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 
 /** Intent module. Launch other activities or open URLs. */
-@ReactModule(name = ShareModule.NAME)
+@ReactModule(name = NativeShareModuleSpec.NAME)
 public class ShareModule extends NativeShareModuleSpec {
 
-  public static final String NAME = "ShareModule";
   /* package */ static final String ACTION_SHARED = "sharedAction";
   /* package */ static final String ERROR_INVALID_CONTENT = "E_INVALID_CONTENT";
   /* package */ static final String ERROR_UNABLE_TO_OPEN_DIALOG = "E_UNABLE_TO_OPEN_DIALOG";
@@ -30,11 +29,6 @@ public class ShareModule extends NativeShareModuleSpec {
     super(reactContext);
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   /**
    * Open a chooser dialog to send text content to other apps.
    *

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

@@ -8,8 +8,6 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/modules/sound/SoundManagerModule.java

@@ -15,20 +15,13 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.annotations.ReactModule;
 
 /** {@link NativeModule} that allows Playing device sounds from JS. */
-@ReactModule(name = SoundManagerModule.NAME)
+@ReactModule(name = NativeSoundManagerSpec.NAME)
 public class SoundManagerModule extends NativeSoundManagerSpec {
 
-  public static final String NAME = "SoundManager";
-
   public SoundManagerModule(ReactApplicationContext reactContext) {
     super(reactContext);
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   @Override
   public void playTouchSound() {
     AudioManager audioManager =

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

@@ -8,18 +8,15 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-        react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

package/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java

@@ -32,7 +32,7 @@ import com.facebook.react.uimanager.PixelUtil;
 import java.util.Map;
 
 /** {@link NativeModule} that allows changing the appearance of the status bar. */
-@ReactModule(name = StatusBarModule.NAME)
+@ReactModule(name = NativeStatusBarManagerAndroidSpec.NAME)
 public class StatusBarModule extends NativeStatusBarManagerAndroidSpec {
 
   private static final String HEIGHT_KEY = "HEIGHT";
@@ -43,11 +43,6 @@ public class StatusBarModule extends NativeStatusBarManagerAndroidSpec {
     super(reactContext);
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   @Override
   public @Nullable Map<String, Object> getTypedExportedConstants() {
     final Context context = getReactApplicationContext();

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

@@ -32,7 +32,8 @@ public class AndroidInfoHelpers {
   }
 
   private static boolean isRunningOnStockEmulator() {
-    return Build.FINGERPRINT.contains("generic");
+    return Build.FINGERPRINT.contains("generic")
+        || Build.FINGERPRINT.startsWith("google/sdk_gphone");
   }
 
   public static String getServerHost(Integer port) {