commit fb95b0d71f4a56ea537899d8d494d179c0739710
author Jorge E. Moreira <jemoreira@google.com> Tue Feb 05 17:40:20 2019 -0800
committer Jorge E. Moreira <jemoreira@google.com> Tue Feb 05 17:40:41 2019 -0800
tree d026f23e3b3e3290f5e5cbcb2a366df6343d0502
parent cf4fc2a0fc07affede6da8a8f58c86fc359958d6

Set start_stream_audio to false by default when vm_manager=crosvm

Bug: 122978436
Test: build&run locally with both vm_managers
Change-Id: Ica7d03704778cfb6e71c9c5f57c6419af799c9f8

host/commands/launch/flags.cc

diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index b1c6a1c..dbb44bf 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -477,6 +477,8 @@
                                google::FlagSettingMode::SET_FLAGS_DEFAULT);
   SetCommandLineOptionWithMode("start_vnc_server", "false",
                                google::FlagSettingMode::SET_FLAGS_DEFAULT);
+  SetCommandLineOptionWithMode("start_stream_audio", "false",
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
 }
 
 bool ParseCommandLineFlags(int* argc, char*** argv) {

host/commands/launch/launch.cc

diff --git a/host/commands/launch/launch.cc b/host/commands/launch/launch.cc
index 4ad14b3..37ce5a3 100644
--- a/host/commands/launch/launch.cc
+++ b/host/commands/launch/launch.cc
@@ -167,7 +167,7 @@
 void LaunchStreamAudioIfEnabled(const vsoc::CuttlefishConfig& config,
                                 cvd::ProcessMonitor* process_monitor,
                                 std::function<bool(MonitorEntry*)> callback) {
-  if (VSoCEnabled(config) && config.enable_stream_audio()) {
+  if (config.enable_stream_audio()) {
     auto port_options = "-port=" + std::to_string(config.stream_audio_port());
     cvd::Command stream_audio(config.stream_audio_binary());
     stream_audio.AddParameter(port_options);