From 452154802feb805d9a7c547841ea35f9de2f02b0 Mon Sep 17 00:00:00 2001
From: generatedunixname89002005232357 <generatedunixname89002005232357@fb.com>
Date: Wed, 5 Apr 2023 10:15:57 -0700
Subject: [PATCH] Revert D44566060: Multisect successfully blamed D44566060 for
 test or build failures

Summary:
This diff is reverting D44566060
D44566060: Add Flipper support for secondary processes in Messenger VR by rra has been identified to be causing the following test or build failures:

Tests affected:
- [//fbandroid/javatests/com/facebook/messenger:no_sonar_in_production - main](https://www.internalfb.com/intern/test/281474996792449/)

Here's the Multisect link:
https://www.internalfb.com/multisect/1809753
Here are the tasks that are relevant to this breakage:

We're generating a revert to back out the changes in this diff, please note the backout may land if someone accepts it.

If you believe this diff has been generated in error you may Commandeer and Abandon it.

Reviewed By: passy

Differential Revision: D44682510

fbshipit-source-id: c0ae489bc5ae22c5339edd2c8988126b0adedd7f
---
 .../flipper/android/AndroidFlipperClient.java  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
index 3ae551480..d0e1f6ff5 100644
--- a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
+++ b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
@@ -26,8 +26,7 @@ public final class AndroidFlipperClient {
   private static final String[] REQUIRED_PERMISSIONS =
       new String[] {"android.permission.INTERNET", "android.permission.ACCESS_WIFI_STATE"};
 
-  public static synchronized FlipperClient getInstance(
-      Context context, String id, String deviceName, String processName, String packageName) {
+  public static synchronized FlipperClient getInstance(Context context) {
     if (!sIsInitialized) {
       if (!(BuildConfig.IS_INTERNAL_BUILD || BuildConfig.LOAD_FLIPPER_EXPLICIT)) {
         Log.e("Flipper", "Attempted to initialize in non-internal build");
@@ -59,23 +58,16 @@ public final class AndroidFlipperClient {
           FlipperProps.getAltSecurePort(),
           getServerHost(app),
           "Android",
-          deviceName,
-          id,
-          processName,
-          packageName,
+          getFriendlyDeviceName(),
+          getId(),
+          getRunningAppName(app),
+          getPackageName(app),
           privateAppDirectory);
       sIsInitialized = true;
     }
     return FlipperClientImpl.getInstance();
   }
 
-  public static synchronized FlipperClient getInstance(Context context) {
-    final Context app =
-        context.getApplicationContext() == null ? context : context.getApplicationContext();
-    return getInstance(
-        context, getId(), getFriendlyDeviceName(), getRunningAppName(app), getPackageName(app));
-  }
-
   @Nullable
   public static synchronized FlipperClient getInstanceIfInitialized() {
     if (!sIsInitialized) {