commit 2fddd37d1f8eeb410aa2499ff582220b55dd80d6
author Haixia Shi <hshi@chromium.org> Thu Oct 15 16:21:48 2015 -0700
committer Haixia Shi <hshi@chromium.org> Thu Oct 15 17:10:20 2015 -0700
tree a5ab6968044a4fe5a2a7bbb8010e98165db07239
parent d75d8d2bf2f53511b1826452c2a8547b6a338cc7

drm_hwcomposer: do not queue layers map for virtual display

It is invalid to add a DrmCompositionDisplayLayersMap for the virtual
display because the corresponding physical display resources (such as
crtc, connector, etc.) do not exist.

BUG=24985282
TEST=verify that no crash occurs

Change-Id: I24a6671e7f94032a38104ae7ed3eb0da79479601

hwcomposer.cpp

diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index ac7fdac..31cbada 100644
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -498,7 +498,7 @@
   for (size_t i = 0; i < num_displays; ++i) {
     hwc_display_contents_1_t *dc = sf_display_contents[i];
     DrmHwcDisplayContents &display_contents = displays_contents[i];
-    if (!sf_display_contents[i])
+    if (!sf_display_contents[i] || i == HWC_DISPLAY_VIRTUAL)
       continue;
 
     layers_map.emplace_back();
@@ -596,7 +596,8 @@
       *value = 1000 * 1000 * 1000 / 60;
       break;
     case HWC_DISPLAY_TYPES_SUPPORTED:
-      *value = HWC_DISPLAY_PRIMARY | HWC_DISPLAY_EXTERNAL | HWC_DISPLAY_VIRTUAL;
+      *value = HWC_DISPLAY_PRIMARY_BIT | HWC_DISPLAY_EXTERNAL_BIT |
+               HWC_DISPLAY_VIRTUAL_BIT;
       break;
   }
   return 0;