commit 81d0d60a89ef39df14766dc8bff229ff354c1707
author Cody Schuffelen <schuffelen@google.com> Tue Apr 30 14:33:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 30 14:33:19 2019 -0700
tree e719204e6ce39424c0535c16862d557cf56b439e
parent 98cf29744eb6b2172aea5af3deac501d6a50f29f
parent 957e8622dd57f8ccfed08f908730dd6f89245d4b

Fix spurious "ADB not enabled" warning.
am: 957e8622dd

Change-Id: I0b775c43ee0483f14ca771fc0ab2638acb72ee16

host/commands/launch/launch.cc

diff --git a/host/commands/launch/launch.cc b/host/commands/launch/launch.cc
index baf21c9..dd5ab82 100644
--- a/host/commands/launch/launch.cc
+++ b/host/commands/launch/launch.cc
@@ -100,7 +100,7 @@
 
 void ValidateAdbModeFlag(const vsoc::CuttlefishConfig& config) {
   if (!AdbUsbEnabled(config) && !AdbTunnelEnabled(config)
-      && !AdbVsockTunnelEnabled(config)) {
+      && !AdbVsockTunnelEnabled(config) && !AdbVsockHalfTunnelEnabled(config)) {
     LOG(INFO) << "ADB not enabled";
   }
 }