| commit | a8e4acf125c5372a5eb2538573cd7a747e574bbb | [log] [tgz] |
|---|---|---|
| author | Ryan Haining <haining@google.com> | Mon Jul 09 12:26:59 2018 -0700 |
| committer | Greg Hartman <ghartman@google.com> | Mon Jul 23 21:36:43 2018 -0700 |
| tree | 44e22821844fff86dffc41db8a084ec9019c5dc3 | |
| parent | 1f6cafee2b7ca7db3cd25898d5cad29921dfb7a0 [diff] |
Disables adb connector if there's no adb tunnel Bug: 111266050 Test: run with --adb_mode=usb, run with --adb_mode=tunnel Change-Id: Idceff7c137fa849c3f91675e29516aeb988d7df6 Merged-In: Idceff7c137fa849c3f91675e29516aeb988d7df6 (cherry picked from commit 37dbbd4f979a2147bff227e5ee4d3ead67f72597)
diff --git a/host/commands/launch/main.cc b/host/commands/launch/main.cc index eab020c..562167a 100644 --- a/host/commands/launch/main.cc +++ b/host/commands/launch/main.cc
@@ -349,7 +349,7 @@ } bool AdbConnectorEnabled() { - return FLAGS_run_adb_connector; + return FLAGS_run_adb_connector && AdbTunnelEnabled(); } void LaunchIvServer() {