LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't throw when we fail to find a device.

Browse Source 
Instead, set it to None and let the caller handle things.

Change-Id: Ic4f27fdb52ebd6bc5b4048e4e688ec7bd2509bfa
This commit is contained in:
Josh Gao
2015-10-28 11:57:37 -07:00
parent 3fd43b5bf4
commit 44b84a8e03
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python-packages/gdbrunner/__init__.py
View File

@@ -63,6 +63,7 @@ class ArgumentParser(argparse.ArgumentParser):
msg += "\n Try specifying its location with --adb." msg += "\n Try specifying its location with --adb."
sys.exit(msg.format(adb_path)) sys.exit(msg.format(adb_path))
try:
if result.device == "-a": if result.device == "-a":
result.device = adb.get_device(adb_path=adb_path) result.device = adb.get_device(adb_path=adb_path)
elif result.device == "-d": elif result.device == "-d":
@@ -71,6 +72,9 @@ class ArgumentParser(argparse.ArgumentParser):
result.device = adb.get_emulator_device(adb_path=adb_path) result.device = adb.get_emulator_device(adb_path=adb_path)
else: else:
result.device = adb.get_device(result.serial, adb_path=adb_path) result.device = adb.get_device(result.serial, adb_path=adb_path)
except (adb.DeviceNotFoundError, adb.NoUniqueDeviceError, RuntimeError):
# Don't error out if we can't find a device.
result.device = None
return result return result

4
scripts/gdbclient.py
View File

@@ -210,6 +210,10 @@ end
def main(): def main():
args = parse_args() args = parse_args()
device = args.device device = args.device
if device is None:
sys.exit("ERROR: Failed to find device.")
props = device.get_props() props = device.get_props()
root = os.environ["ANDROID_BUILD_TOP"] root = os.environ["ANDROID_BUILD_TOP"]