commit 277007951249c813fe9511c1dba512486207d473
author Linux Build Service Account <lnxbuild@localhost> Sat Jun 22 02:26:16 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 22 02:26:21 2019 -0700
tree 7eb42fcc9d98ab848b769d02e4347986f1e8de7c
parent 2cc00f7a8b11b825889f68152ba289c900c8b367
parent 9b9acfe4ccbec6337fc452240448cd117ac176a4

Merge "sdm: Handle color mode setting in ApplyCurrentColorModeWithRenderIntent()" into display.lnx.5.1

sdm/libs/hwc2/hwc_display.cpp

diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index 2c6d913..a886942 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -170,6 +170,10 @@
 }
 
 HWC2::Error HWCColorMode::ApplyCurrentColorModeWithRenderIntent(bool hdr_present) {
+  // If panel does not support color modes, do not set color mode.
+  if (color_mode_map_.size() <= 1) {
+    return HWC2::Error::None;
+  }
   if (!apply_mode_) {
     if ((hdr_present && curr_dynamic_range_ == kHdrType) ||
       (!hdr_present && curr_dynamic_range_ == kSdrType))