commit abcf57f92f9a1d581113588ef4c3fd0a0387a222
author Jorge E. Moreira <jemoreira@google.com> Tue Mar 26 18:10:53 2019 -0700
committer Jorge E. Moreira <jemoreira@google.com> Tue Mar 26 18:10:53 2019 -0700
tree 0922400669cd25dd64558a32e76f9e8753078e2a
parent c87c2c777f9c54a16cb3d04dd384a76d3130771c

Always allocate a buffer in hwcomposer.cutf_cvm

Bug: 129367157
Test: run locally
Change-Id: I4c45e0cd832b7f913b05d110ae5ee2442e602449

guest/hals/hwcomposer/cutf_cvm/base_composer.cpp

diff --git a/guest/hals/hwcomposer/cutf_cvm/base_composer.cpp b/guest/hals/hwcomposer/cutf_cvm/base_composer.cpp
index cda2750..23be7e1 100644
--- a/guest/hals/hwcomposer/cutf_cvm/base_composer.cpp
+++ b/guest/hals/hwcomposer/cutf_cvm/base_composer.cpp
@@ -81,18 +81,25 @@
           2, property_get_int32("ro.boot.vsock_frames_port", 5580),
           SOCK_STREAM)),
       broadcast_thread_([this]() { BroadcastLoop(); }) {
-  // TODO(b/128842613): Get this info from the configuration server
-  int32_t screen_params[4];
-  auto res = screen_server_->Read(screen_params, sizeof(screen_params));
-  if (res != sizeof(screen_params)) {
-    LOG(ERROR) << "Unable to get screen configuration parameters from screen "
-               << "server (" << res << "): " << screen_server_->StrError();
-    return;
+  if (screen_server_->IsOpen()) {
+    // TODO(b/128842613): Get this info from the configuration server
+    int32_t screen_params[4];
+    auto res = screen_server_->Read(screen_params, sizeof(screen_params));
+    if (res == sizeof(screen_params)) {
+      x_res_ = screen_params[0];
+      y_res_ = screen_params[1];
+      dpi_ = screen_params[2];
+      refresh_rate_ = screen_params[3];
+    } else {
+      LOG(ERROR) << "Unable to get screen configuration parameters from screen "
+                 << "server (" << res << "): " << screen_server_->StrError();
+    }
+  } else {
+    LOG(ERROR) << "Unable to connect to screen server: "
+               << screen_server_->StrError();
   }
-  x_res_ = screen_params[0];
-  y_res_ = screen_params[1];
-  dpi_ = screen_params[2];
-  refresh_rate_ = screen_params[3];
+  // This needs to happen no matter what, otherwise there won't be a buffer for
+  // the set calls to compose on.
   inner_buffer_ = std::vector<char>(FrameBuffer::buffer_size() * 8);
 }
 
@@ -109,6 +116,12 @@
 }
 
 void FrameBuffer::BroadcastLoop() {
+  if (!screen_server_->IsOpen()) {
+    LOG(ERROR) << "Broadcaster thread exiting due to no connection to screen"
+               << " server. Compositions will occur, but frames won't be sent"
+               << " anywhere";
+    return;
+  }
   int32_t current_seq = 0;
   int32_t current_offset;
   while (running_) {