commit 37ce90dd8615ed18c2c9fd72e34efbf6acd364a3
author Peiyong Lin <lpy@google.com> Fri Jan 04 19:24:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 04 19:24:11 2019 +0000
tree bf8e346737d114b77edcf9e52b0968aaac80529b
parent 4db5fa02cf4c13901b1e3ae3f359efda6a62e91a
parent df65fd279971c623c7d66067335a9f38ac334f05

Merge "Use global capabilities for Display without a valid HWC display ID."

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 0497571..168b27c 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -98,6 +98,10 @@
 bool HWComposer::hasDisplayCapability(const std::optional<DisplayId>& displayId,
                                       HWC2::DisplayCapability capability) const {
     if (!displayId) {
+        // Checkout global capabilities for displays without a corresponding HWC display.
+        if (capability == HWC2::DisplayCapability::SkipClientColorTransform) {
+            return hasCapability(HWC2::Capability::SkipClientColorTransform);
+        }
         return false;
     }
     RETURN_IF_INVALID_DISPLAY(*displayId, false);