commit 2dc6285c81bf17f39d63894256f787f789c1af60
author Tristan Muntsinger <muntsinger@google.com> Fri May 17 18:10:24 2019 -0700
committer Tristan Muntsinger <muntsinger@google.com> Tue May 21 15:07:48 2019 -0700
tree 4be066b49a21ab8541b93137d9d539cf7e682c67
parent 7f204bbcdbdc03e11c34542d8932462260a8aa9a

Fix silent failure in hwcomposer initialization

Also add a check in the vsync thread for a similar error check.

BUG: 133011914
Test: Local build and boot
Change-Id: Ib913cb863266603c214bd19e94bbacf472a757c2

guest/hals/hwcomposer/common/hwcomposer.cpp

diff --git a/guest/hals/hwcomposer/common/hwcomposer.cpp b/guest/hals/hwcomposer/common/hwcomposer.cpp
index f18534b..56b2315 100644
--- a/guest/hals/hwcomposer/common/hwcomposer.cpp
+++ b/guest/hals/hwcomposer/common/hwcomposer.cpp
@@ -44,9 +44,10 @@
   while (true) {
     struct timespec rt;
     if (clock_gettime(CLOCK_MONOTONIC, &rt) == -1) {
-      ALOGE("%s:%d error in vsync thread clock_gettime: %s", __FILE__, __LINE__,
-            strerror(errno));
+      LOG_ALWAYS_FATAL("%s:%d error in vsync thread clock_gettime: %s",
+        __FILE__, __LINE__, strerror(errno));
     }
+
     int64_t timestamp = int64_t(rt.tv_sec) * 1e9 + rt.tv_nsec;
     // Given now's timestamp calculate the time of the next timestamp.
     timestamp += pdev->vsync_period_ns -

guest/hals/hwcomposer/vsoc/hwcomposer.cpp

diff --git a/guest/hals/hwcomposer/vsoc/hwcomposer.cpp b/guest/hals/hwcomposer/vsoc/hwcomposer.cpp
index 16b63ba..2aaedd9 100644
--- a/guest/hals/hwcomposer/vsoc/hwcomposer.cpp
+++ b/guest/hals/hwcomposer/vsoc/hwcomposer.cpp
@@ -440,8 +440,8 @@
   dev->vsync_data.vsync_period_ns = 1000000000 / refreshRate;
   struct timespec rt;
   if (clock_gettime(CLOCK_MONOTONIC, &rt) == -1) {
-    ALOGE("%s:%d error in vsync thread clock_gettime: %s", __FILE__, __LINE__,
-          strerror(errno));
+    LOG_ALWAYS_FATAL("%s:%d error in vsync thread clock_gettime: %s", __FILE__,
+      __LINE__, strerror(errno));
   }
   dev->vsync_data.vsync_base_timestamp = int64_t(rt.tv_sec) * 1e9 + rt.tv_nsec;