From b95a487748f840948da2e44c8a6494d5e15d85d2 Mon Sep 17 00:00:00 2001 From: John Knox Date: Mon, 8 Oct 2018 14:41:41 -0700 Subject: [PATCH] Back out "[flipper] Fix remote adb connections" Summary: Original commit changeset: e53aa6ad10ac This original change relies on adb reverse being run on emulators, which isn't happening. I didn't pick it up during tests because a previous build of flipper had done it. Reverting the change. Will fix adb reverse and then re apply it later. Reviewed By: priteshrnandgaonkar Differential Revision: D10241728 fbshipit-source-id: 521c18c5a0eb45f3af0fe510defd9116b9bb0626 --- .../facebook/flipper/android/AndroidFlipperClient.java | 8 ++------ 1 file changed, 2 insertions(+), 6 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 2cb9d95e1..9be897baf 100644 --- a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java +++ b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java @@ -89,10 +89,7 @@ public final class AndroidFlipperClient { } static String getServerHost(Context context) { - if (isRunningOnStockEmulator() && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - // adb reverse was added in lollipop, so before this - // hard code host ip address. - // This means it will only work on emulators, not physical devices. + if (isRunningOnStockEmulator()) { return "10.0.2.2"; } else if (isRunningOnGenymotion()) { // This is hand-wavy but works on but ipv4 and ipv6 genymotion @@ -101,8 +98,7 @@ public final class AndroidFlipperClient { final int ip = info.getIpAddress(); return String.format("%d.%d.%d.2", (ip & 0xff), (ip >> 8 & 0xff), (ip >> 16 & 0xff)); } else { - // Running on physical device or modern stock emulator. - // Flipper desktop will run `adb reverse` to forward the ports. + // Running on physical device. Flipper desktop will run `adb reverse tcp:8088 tcp:8088` return "localhost"; } }