commit 37e91b4d50967474f2e4d5f18cc90a490d830bb3
author Jorge E. Moreira <jemoreira@google.com> Thu Jun 20 17:53:35 2019 -0700
committer Jorge Moreira Broche <jemoreira@google.com> Fri Jun 21 00:55:18 2019 +0000
tree f9ab1c180794521d69ed7264c03d9b492b8c4ce3
parent f42e253650962efa621bc108f3ca198278b9f30a

Don't send the screen parameter from the vnc server anymore

These are sent from the configuration server now.

Bug: 134972437
Test: run locally
Change-Id: I54c1de96c01a8967eddbb87154d171fb0fc711bb

host/frontend/vnc_server/screen_connector.cpp

diff --git a/host/frontend/vnc_server/screen_connector.cpp b/host/frontend/vnc_server/screen_connector.cpp
index 4551450..03e945a 100644
--- a/host/frontend/vnc_server/screen_connector.cpp
+++ b/host/frontend/vnc_server/screen_connector.cpp
@@ -52,7 +52,7 @@
 //  wayland mock
 class SocketBasedScreenConnector : public ScreenConnector {
  public:
-  SocketBasedScreenConnector(vsoc::CuttlefishConfig* config) : config_(config) {
+  SocketBasedScreenConnector() {
     screen_server_thread_ = std::thread([this]() { ServerLoop(); });
   }
 
@@ -95,7 +95,6 @@
         LOG(ERROR) << "Disconnected fd returned from accept";
         continue;
       }
-      SendScreenParameters(conn);
       while (conn->IsOpen()) {
         int32_t size = 0;
         conn->Read(&size, sizeof(size));
@@ -116,22 +115,6 @@
     }
   }
 
-  void SendScreenParameters(SharedFD conn) const {
-    // TODO(b/128842613): Send this info from the configuration server
-    int32_t screen_params[4];
-    screen_params[0] = config_->x_res();
-    screen_params[1] = config_->y_res();
-    screen_params[2] = config_->dpi();
-    screen_params[3] = config_->refresh_rate_hz();
-    int buff_size = sizeof(screen_params);
-    int res = conn->Write(screen_params, buff_size);
-    if (res != buff_size) {
-          LOG(FATAL)
-              << "Unable to send full screen parameters to the hwcomposer ("
-              << res << "): " << conn->StrError();
-        }
-  }
-
   void BroadcastNewFrame(int buffer_idx) {
     {
       std::lock_guard<std::mutex> lock(new_frame_mtx_);
@@ -141,7 +124,6 @@
     new_frame_cond_var_.notify_all();
   }
 
-  vsoc::CuttlefishConfig* config_;
   std::vector<std::uint8_t> buffer_ =
       std::vector<std::uint8_t>(NUM_BUFFERS_ * ScreenSizeInBytes());
   std::uint32_t seq_num_{0};
@@ -157,9 +139,9 @@
   if (config->enable_ivserver()) {
     return new VSoCScreenConnector();
   } else {
-    return new SocketBasedScreenConnector(config);
+    return new SocketBasedScreenConnector();
   }
 }
 
 }  // namespace vnc
-}  // namespace cvd
\ No newline at end of file
+}  // namespace cvd