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

Fix remote adb connections

Browse Source 
Summary: On emulators and devices that support adb reverse, using localhost will always work, whereas "10.0.2.2" won't work for networked adb connections.

Reviewed By: passy

Differential Revision: D10231163

fbshipit-source-id: e53aa6ad10ac4964431694c48e7148add69487fb
This commit is contained in:
John Knox
2018-10-08 04:41:24 -07:00
committed by Facebook Github Bot
parent 52e43e6ab8
commit 287542c49a
1 changed files with 6 additions and 2 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,7 +89,10 @@ public final class AndroidFlipperClient {
} }
static String getServerHost(Context context) { static String getServerHost(Context context) {
if (isRunningOnStockEmulator()) { 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.
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
@@ -98,7 +101,8 @@ 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. Flipper desktop will run `adb reverse tcp:8088 tcp:8088` // Running on physical device or modern stock emulator.
// Flipper desktop will run `adb reverse` to forward the ports.
return "localhost"; return "localhost";
} }
} }