commit 2b7727e80fec6be22665509a39ee1dae2a052656
author ChihYao Chien <ccchien@google.com> Fri May 14 14:24:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 14 14:24:59 2021 +0000
tree 74706ebbc0bd7de8fa29038d4bb1aa9c4d285932
parent 22ffd71ea221ea5429a1fe402e9ee516caebe2f7
parent 9bc4795125a764b4bc60c5eae13b6820ded2e637

Disable HDR+ due to unsupported am: 9bc4795125

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7250/display/+/14257142

Change-Id: I9f0ac02d626c9ad405bb4bbb43191a46384d542d

sdm/libs/core/display_builtin.cpp

diff --git a/sdm/libs/core/display_builtin.cpp b/sdm/libs/core/display_builtin.cpp
index 4f83bfd..6a869de 100644
--- a/sdm/libs/core/display_builtin.cpp
+++ b/sdm/libs/core/display_builtin.cpp
@@ -1336,8 +1336,8 @@
   hw_info_intf_->GetHWResourceInfo(&hw_resource_info);
 
   fixed_info->hdr_supported = hw_resource_info.has_hdr;
-  // Built-in displays always support HDR10+ when the target supports HDR
-  fixed_info->hdr_plus_supported = hw_resource_info.has_hdr;
+  // Built-in displays not support HDR10+ even the target supports HDR to comply with spec
+  fixed_info->hdr_plus_supported = false;
   // Populate luminance values only if hdr will be supported on that display
   fixed_info->max_luminance = fixed_info->hdr_supported ? hw_panel_info_.peak_luminance: 0;
   fixed_info->average_luminance = fixed_info->hdr_supported ? hw_panel_info_.average_luminance : 0;