commit 8e9c7122464380e7cf7171524f545fc91654f47e
author Ryan Haining <haining@google.com> Fri Jul 27 11:55:46 2018 -0700
committer Ryan Haining <haining@google.com> Fri Jul 27 14:41:12 2018 -0700
tree 726ee1410ad2b2a711607f9aba1dc4c18c7ed6cc
parent 6d821eceb9930d904d2843a94e28cd215bd84234

Uses config->device_title() for vnc server name

Test: local
Bug: 111928072
Change-Id: I17860f4da02f5f23fb935d0d5c032f73548cbea5

host/frontend/vnc_server/vnc_client_connection.cpp

diff --git a/host/frontend/vnc_server/vnc_client_connection.cpp b/host/frontend/vnc_server/vnc_client_connection.cpp
index fb0b417..d680a8f 100644
--- a/host/frontend/vnc_server/vnc_client_connection.cpp
+++ b/host/frontend/vnc_server/vnc_client_connection.cpp
@@ -36,6 +36,7 @@
 #include "host/frontend/vnc_server/keysyms.h"
 #include "host/frontend/vnc_server/mocks.h"
 #include "host/frontend/vnc_server/vnc_utils.h"
+#include "host/libs/config/cuttlefish_config.h"
 
 using cvd::Message;
 using cvd::vnc::Stripe;
@@ -117,9 +118,9 @@
 }
 
 std::string HostName() {
-  // Localhost is good enough for local development and to connect through ssh
-  // tunneling, for something else this probably needs to change.
-  return "localhost";
+  auto config = vsoc::CuttlefishConfig::Get();
+  return !config || config->device_title().empty() ? std::string{"localhost"}
+                                                   : config->device_title();
 }
 
 std::uint16_t uint16_tAt(const void* p) {