commit 99cd5d58cd3591f2d92328636f1f35bc9e14457a
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Jun 02 13:15:54 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 02 13:15:54 2017 -0700
tree 528159890f9597b2eaccd1ed13f970806279fb7b
parent c1e2cde9919a499f89612131888460db9219ab5a
parent 1cd6d0e3c55380af837f38748083655a0119f3e6

Merge "sdm: Use color metadata if Android framework metadata is not set"

sdm/libs/hwc2/hwc_layers.cpp

diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index 30e9f83..7fef9cf 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -527,9 +527,14 @@
 
 DisplayError HWCLayer::SetMetaData(const private_handle_t *pvt_handle, Layer *layer) {
   LayerBuffer *layer_buffer = &layer->input_buffer;
+  bool use_color_metadata = true;
 
+#ifdef FEATURE_WIDE_COLOR
   // Only use color metadata if Android framework metadata is not set
-  if (dataspace_ == HAL_DATASPACE_UNKNOWN) {
+  use_color_metadata = (dataspace_ == HAL_DATASPACE_UNKNOWN);
+#endif
+
+  if (use_color_metadata) {
     if (sdm::SetCSC(pvt_handle, &layer_buffer->color_metadata) != kErrorNone) {
       return kErrorNotSupported;
     }