commit f739badb46fd92a556931b02ceb751a102d9dbac
author Chia-I Wu <olv@google.com> Wed May 09 12:36:57 2018 -0700
committer Chia-I Wu <olv@google.com> Fri Aug 31 17:17:45 2018 +0000
tree 1ba4c7f7cb02d162aea090b6aa63e7f2223434fd
parent 8cc536c8d082d5f1100e0765e9544ba7ef191714

Configuration#isScreenHdr should depend on hasHdrDisplay

isScreenHdr should check for
ISurfaceFlingerConfigs#{hasHdrDisplay,hasWideColorDisplay} in
addition to DisplayInfo#isHdr before returning true.

Bug: 79478600
Test: am get-config
Change-Id: Ib8bd0d330d2ecde0fdc6b42545c2a0b1faca49d3

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index ba46737..fae4539 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1421,7 +1421,7 @@
         config.densityDpi = displayInfo.logicalDensityDpi;
 
         config.colorMode =
-                (displayInfo.isHdr()
+                ((displayInfo.isHdr() && mService.hasHdrSupport())
                         ? Configuration.COLOR_MODE_HDR_YES
                         : Configuration.COLOR_MODE_HDR_NO)
                         | (displayInfo.isWideColorGamut() && mService.hasWideColorGamutSupport()