commit c1f18f6fd56e2e7c090f838232df14779f300d6e
author Dominik Laskowski <domlaskowski@google.com> Wed Jun 13 15:17:55 2018 -0700
committer Dominik Laskowski <domlaskowski@google.com> Tue Jun 19 15:17:27 2018 -0700
tree 227ac41b77fac1350cec2796437adc8e7e0e451a
parent 0954b1d8388c134b3d8c3d7f5bfb05a60e97eb5a

SF: Remember display type in DisplayData

This obviates querying the HWC to determine if a display is physical or
virtual.

Bug: 74619554
Test: libsurfaceflinger_unittest
Change-Id: I9a18d480358f4195c66c183c70ffbe8480bd25b8

services/surfaceflinger/DisplayHardware/HWComposer.h

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index b292a04..3c5efea 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -188,14 +188,13 @@
     // For unit tests
     friend TestableSurfaceFlinger;
 
-    static const int32_t VIRTUAL_DISPLAY_ID_BASE = 2;
-
     bool isValidDisplay(int32_t displayId) const;
     static void validateChange(HWC2::Composition from, HWC2::Composition to);
 
     struct cb_context;
 
     struct DisplayData {
+        bool isVirtual = false;
         bool hasClientComposition = false;
         bool hasDeviceComposition = false;
         HWC2::Display* hwcDisplay = nullptr;