commit 37dbbd4f979a2147bff227e5ee4d3ead67f72597
author Ryan Haining <haining@google.com> Mon Jul 09 12:26:59 2018 -0700
committer Ryan Haining <haining@google.com> Mon Jul 09 12:26:59 2018 -0700
tree da7d41656820b2dbbdd80ada19a13af0c933f5cf
parent 3c8203b960edb1113779a2bdd73c0fa88f080870

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

host/commands/launch/main.cc

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() {