Don't accidentally use error message as Android device name

pimterry · pimterry · commit 43e13dee15f6 · 2025-08-29T20:21:55.000+02:00
diff --git a/src/interceptors/android/adb-commands.ts b/src/interceptors/android/adb-commands.ts
@@ -159,13 +159,12 @@ const getDeviceName = async (adbClient: Adb.Client, deviceId: string) => {
                     .catch(() => {})
             )?.trim();
 
-            if (name) {
+            if (name && !name.startsWith('cmd: Failure calling service')) {
                 deviceName = name;
             } else {
                 const props = await device.getProperties();
 
-                deviceName = props['ro.product.model'] ||
-                    deviceId;
+                deviceName = props['ro.product.model'] || deviceId;
             }
         }
     } catch (e: any) {

Original file line number	Diff line number	Diff line change
`@@ -159,13 +159,12 @@ const getDeviceName = async (adbClient: Adb.Client, deviceId: string) => {`
`159`	`159`	`.catch(() => {})`
`160`	`160`	`)?.trim();`
`161`	`161`
`162`		`- if (name) {`
	`162`	`+ if (name && !name.startsWith('cmd: Failure calling service')) {`
`163`	`163`	`deviceName = name;`
`164`	`164`	`} else {`
`165`	`165`	`const props = await device.getProperties();`
`166`	`166`
`167`		`- deviceName = props['ro.product.model'] \|\|`
`168`		`- deviceId;`
	`167`	`+ deviceName = props['ro.product.model'] \|\| deviceId;`
`169`	`168`	`}`
`170`	`169`	`}`
`171`	`170`	`} catch (e: any) {`