Browse files

Don't treat IP address in serial number as regex

When adb is connected to remote device on network, the serial number
can be of the form "". This should not be treated as
a regex, but rather as a literal serial number.

Signed-off-by: Matt Gumbel <>
  • Loading branch information...
1 parent 7021695 commit 8b311130ac469cfb188dfe6287a9201c836a31d4 Matt Gumbel committed Dec 12, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 AndroidViewClient/src/com/dtmilano/android/
2 AndroidViewClient/src/com/dtmilano/android/
@@ -1076,7 +1076,7 @@ def connectToDeviceOrExit(timeout=60, verbose=False, ignoresecuredevice=False, s
if secure == '1' and debuggable == '0' and not ignoresecuredevice and version < 16:
print >> sys.stderr, "%s: ERROR: Device is secure, AndroidViewClient won't work." % progname
- if"[.*()+]", serialno):
+ if"[.*()+]", serialno) and not"(\d{1,3}\.){3}\d{1,3}"):
# if a regex was used we have to determine the serialno used
serialno = ViewClient.__obtainDeviceSerialNumber(device)
return device, serialno

0 comments on commit 8b31113

Please sign in to comment.