jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out "[flipper] Fix remote adb connections"

Browse Source 
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
This commit is contained in:
John Knox
2018-10-08 14:41:41 -07:00
committed by Facebook Github Bot
parent 287542c49a
commit b95a487748
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
View File

@@ -89,10 +89,7 @@ public final class AndroidFlipperClient {
} }
static String getServerHost(Context context) { static String getServerHost(Context context) {
if (isRunningOnStockEmulator() && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { if (isRunningOnStockEmulator()) {
// 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.
return "10.0.2.2"; return "10.0.2.2";
} else if (isRunningOnGenymotion()) { } else if (isRunningOnGenymotion()) {
// This is hand-wavy but works on but ipv4 and ipv6 genymotion // 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(); final int ip = info.getIpAddress();
return String.format("%d.%d.%d.2", (ip & 0xff), (ip >> 8 & 0xff), (ip >> 16 & 0xff)); return String.format("%d.%d.%d.2", (ip & 0xff), (ip >> 8 & 0xff), (ip >> 16 & 0xff));
} else { } else {
// Running on physical device or modern stock emulator. // Running on physical device. Flipper desktop will run `adb reverse tcp:8088 tcp:8088`
// Flipper desktop will run `adb reverse` to forward the ports.
return "localhost"; return "localhost";
} }
} }