commit c961756644f88fef336cf48a17c988c31e9cd597
author Yuncheol Heo <ycheo@google.com> Wed Feb 10 20:38:26 2021 -0800
committer ycheo <ycheo@google.com> Thu Feb 11 04:48:11 2021 +0000
tree 444bd2bd6affefc15d75eb5f8896299abc2712fd
parent b904801f5d0d06012df3722cebdc58d18ff4624e

Shows the default display only.

- Currently VNC doesn't support multi-display properly, so cuttlefish
  shows the multi-display screens interchangeably.
  Sadly, it's hard to understand any of displays.

Bug: 171305898
Test: Run cf_auto_x86, and check:
  1. shows the default display only through VNC.
  2. 'dumpsys display' still shows the multi-displays info.
Change-Id: Ib926818133103218a84860e248f427f62c78b018

guest/hals/hwcomposer/hwcomposer.cpp

diff --git a/guest/hals/hwcomposer/hwcomposer.cpp b/guest/hals/hwcomposer/hwcomposer.cpp
index 5ff1d2e..d9c761c 100644
--- a/guest/hals/hwcomposer/hwcomposer.cpp
+++ b/guest/hals/hwcomposer/hwcomposer.cpp
@@ -350,6 +350,12 @@
 
   int retval = -1;
   for (int disp = 0; disp < numDisplays; ++disp) {
+    // TODO(b/171305898): Remove the following condition after it supports
+    // multi-display properly.
+    if (disp > 0) {
+      // Skip the composition besides the default display.
+      break;
+    }
     hwc_display_contents_1_t* contents = displays[disp];
     if (!contents) return 0;