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"; } }