commit ae823e773536ee9b6cf97c575463f1a9902370d9
author Saurabh Shah <saurshah@codeaurora.org> Fri Oct 05 00:08:11 2012 -0400
committer Iliyan Malchev <malchev@google.com> Sun Oct 07 17:20:17 2012 -0700
tree 377948d58574ba1c15f374a297877577cb280de7
parent 6d9d168b0a429b615a055123a9020f496e712bed

hwc: more error checks

-- numHwLayers==1 means that there is only the FB_TARGET which HWC shouldn't
   draw. Also check for blank in set.  Checking for this in prepare prevents us
   from acquiring pipes.
-- add null check for private handle
-- print out vsync timestamp data on error

bug: 7274417
related-to-bug: 7288769
Change-Id: I8dae0d0748c5226fdc33ed8f5cc5259835dec2de
Signed-off-by: Iliyan Malchev <malchev@google.com>

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index f5c3013..12c880a 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -87,7 +87,7 @@
         hwc_display_contents_1_t *list) {
     hwc_context_t* ctx = (hwc_context_t*)(dev);
     ctx->overlayInUse[HWC_DISPLAY_PRIMARY] = false;
-    if (LIKELY(list && list->numHwLayers)) {
+    if (LIKELY(list && list->numHwLayers > 1)) {
         uint32_t last = list->numHwLayers - 1;
         hwc_layer_1_t *fblayer = &list->hwLayers[last];
         setListStats(ctx, list, HWC_DISPLAY_PRIMARY);
@@ -108,7 +108,7 @@
     hwc_context_t* ctx = (hwc_context_t*)(dev);
     ctx->overlayInUse[HWC_DISPLAY_EXTERNAL] = false;
 
-    if (LIKELY(list && list->numHwLayers) &&
+    if (LIKELY(list && list->numHwLayers > 1) &&
         ctx->dpyAttr[HWC_DISPLAY_EXTERNAL].isActive &&
         ctx->dpyAttr[HWC_DISPLAY_EXTERNAL].connected) {
 
@@ -256,7 +256,8 @@
     if(!ctx->overlayInUse[HWC_DISPLAY_PRIMARY])
         ctx->mOverlay[HWC_DISPLAY_PRIMARY]->setState(ovutils::OV_CLOSED);
 
-    if (LIKELY(list && list->numHwLayers)) {
+    if (LIKELY(list && list->numHwLayers > 1) &&
+        ctx->dpyAttr[HWC_DISPLAY_PRIMARY].isActive) {
         uint32_t last = list->numHwLayers - 1;
         hwc_layer_1_t *fbLayer = &list->hwLayers[last];
 
@@ -280,7 +281,7 @@
     if(!ctx->overlayInUse[HWC_DISPLAY_EXTERNAL])
         ctx->mOverlay[HWC_DISPLAY_EXTERNAL]->setState(ovutils::OV_CLOSED);
 
-    if (LIKELY(list && list->numHwLayers) &&
+    if (LIKELY(list && list->numHwLayers > 1) &&
         ctx->dpyAttr[HWC_DISPLAY_EXTERNAL].isActive &&
         ctx->dpyAttr[HWC_DISPLAY_EXTERNAL].connected) {
         uint32_t last = list->numHwLayers - 1;

libhwcomposer/hwc_uimirror.cpp

diff --git a/libhwcomposer/hwc_uimirror.cpp b/libhwcomposer/hwc_uimirror.cpp
index 62b7efd..dd96efe 100644
--- a/libhwcomposer/hwc_uimirror.cpp
+++ b/libhwcomposer/hwc_uimirror.cpp
@@ -63,6 +63,10 @@
         // Set overlay state
         ov.setState(sState);
         private_handle_t *hnd = (private_handle_t *)layer->handle;
+        if (!hnd) {
+            ALOGE("%s:NULL private handle for layer!", __FUNCTION__);
+            return false;
+        }
         ovutils::Whf info(hnd->width, hnd->height, hnd->format, hnd->size);
         // Determine the RGB pipe for UI depending on the state
         ovutils::eDest dest = ovutils::OV_PIPE0;

libhwcomposer/hwc_vsync.cpp

diff --git a/libhwcomposer/hwc_vsync.cpp b/libhwcomposer/hwc_vsync.cpp
index 30b85f4..3053aaf 100644
--- a/libhwcomposer/hwc_vsync.cpp
+++ b/libhwcomposer/hwc_vsync.cpp
@@ -109,8 +109,9 @@
        if (!strncmp(str, "VSYNC=", strlen("VSYNC="))) {
           cur_timestamp = strtoull(str + strlen("VSYNC="), NULL, 0);
        } else {
-          ALOGE ("FATAL:%s:timestamp data not in correct format",
-                                                 __FUNCTION__);
+          ALOGE ("FATAL: %s: vsync timestamp not in correct format: [%s]",
+                  __FUNCTION__,
+                  str);
        }
        // send timestamp to HAL
        ALOGD_IF (VSYNC_DEBUG, "%s: timestamp %llu sent to HWC for %s",