From 7aaf5585a25452debb708d468b8d293eb7ec7f86 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Mon, 21 Sep 2020 09:21:57 -0700 Subject: [PATCH] Fix Android device connection for Kitkat Summary: Probably more than just KitKat, but we got a specific report in https://fburl.com/f88cvz4c for 4.4. ABI lists are not included in the probs and unfortunately TS doesn't resolve this to a `string | undefined` as it should. {F336605489} Reviewed By: jknoxville Differential Revision: D23815568 fbshipit-source-id: b6af928f85549d0c973feb0d83a324252ce0f654 --- desktop/app/src/dispatcher/androidDevice.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/app/src/dispatcher/androidDevice.tsx b/desktop/app/src/dispatcher/androidDevice.tsx index e8c18baa1..d61a2ff3e 100644 --- a/desktop/app/src/dispatcher/androidDevice.tsx +++ b/desktop/app/src/dispatcher/androidDevice.tsx @@ -38,8 +38,8 @@ function createDevice( .then(async (props) => { try { let name = props['ro.product.model']; - const abiString = props['ro.product.cpu.abilist']; - const sdkVersion = props['ro.build.version.sdk']; + const abiString = props['ro.product.cpu.abilist'] || ''; + const sdkVersion = props['ro.build.version.sdk'] || ''; const abiList = abiString.length > 0 ? abiString.split(',') : []; if (type === 'emulator') { name = (await getRunningEmulatorName(device.id)) || name;