diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | vm/adb/adb.go | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 516c92d38..ef9d9cfac 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -118,3 +118,4 @@ Liz Prucka George Kennedy Arm Ltd Andrew Turner +h0wdy diff --git a/vm/adb/adb.go b/vm/adb/adb.go index b63331cc8..96c156130 100644 --- a/vm/adb/adb.go +++ b/vm/adb/adb.go @@ -69,6 +69,7 @@ type instance struct { var ( androidSerial = "^[0-9A-Z]+$" ipAddress = `^(?:localhost|(?:[0-9]{1,3}\.){3}[0-9]{1,3})\:(?:[0-9]{1,5})$` // cuttlefish or remote_device_proxy + emulatorID = `^emulator\-\d+$` ) func loadDevice(data []byte) (*Device, error) { @@ -100,8 +101,8 @@ func ctor(env *vmimpl.Env) (vmimpl.Pool, error) { if len(cfg.Devices) == 0 { return nil, fmt.Errorf("no adb devices specified") } - // Device should be either regular serial number, or a valid Cuttlefish ID. - devRe := regexp.MustCompile(fmt.Sprintf("%s|%s", androidSerial, ipAddress)) + // Device should be either regular serial number, a valid Cuttlefish ID, or an Android Emulator ID. + devRe := regexp.MustCompile(fmt.Sprintf("%s|%s|%s", androidSerial, ipAddress, emulatorID)) for _, dev := range cfg.Devices { device, err := loadDevice(dev) if err != nil { |