From 94cb8935b2e535b6c2ac5b997606445db4e2c572 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Wed, 31 May 2023 09:25:55 -0700 Subject: [PATCH] Fix adb connection Summary: On my mac localhost resolves to an IP6 address by the new adb lib. This should fix it. Reviewed By: LukeDefeo Differential Revision: D46314612 fbshipit-source-id: 3771efd2c6b79fe9ae9851ce4aac35bcede28847 --- .../src/devices/android/__tests__/adbConfig.node.tsx | 4 ++-- desktop/flipper-server-core/src/devices/android/adbConfig.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/flipper-server-core/src/devices/android/__tests__/adbConfig.node.tsx b/desktop/flipper-server-core/src/devices/android/__tests__/adbConfig.node.tsx index 808dedbbe..2f63972c9 100644 --- a/desktop/flipper-server-core/src/devices/android/__tests__/adbConfig.node.tsx +++ b/desktop/flipper-server-core/src/devices/android/__tests__/adbConfig.node.tsx @@ -43,7 +43,7 @@ test('have defaults', () => { process.env.ADB_SERVER_SOCKET = undefined; const {port, host} = adbConfig(); expect(port).toBe(5037); - expect(host).toBe('localhost'); + expect(host).toBe('127.0.0.1'); }); test('prefer settings parameters over ANDROID_ADB_SERVER_PORT', () => { @@ -83,5 +83,5 @@ test('prefer port settings parameters over ANDROID_ADB_SERVER_PORT', () => { process.env.ADB_SERVER_SOCKET = undefined; const {port, host} = adbConfig({port: 1338}); expect(port).toBe(1338); - expect(host).toBe('localhost'); + expect(host).toBe('127.0.0.1'); }); diff --git a/desktop/flipper-server-core/src/devices/android/adbConfig.tsx b/desktop/flipper-server-core/src/devices/android/adbConfig.tsx index c3dba0016..c52f241c0 100644 --- a/desktop/flipper-server-core/src/devices/android/adbConfig.tsx +++ b/desktop/flipper-server-core/src/devices/android/adbConfig.tsx @@ -15,7 +15,7 @@ export default (settings?: {host?: string; port?: number}) => { 5037, ) as number; - let host = 'localhost'; + let host = '127.0.0.1'; const socket = (process.env.ADB_SERVER_SOCKET || '').trim(); if (socket && socket.length > 0) {