commit f42301a6ba6a061d4d8a1dee53d43bfd0c0e5cfb
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 21 03:09:49 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 21 03:09:49 2018 +0000
tree a10c4dea67dec3b2dbe6aa2646626a32b32ce70c
parent 771db5109c3271153d8dae8c6d78a367bcebb232
parent e5239bcff7cb3583a77ada1ec2d1d3aab552a956

Snap for 4966094 from e5239bcff7cb3583a77ada1ec2d1d3aab552a956 to pi-qpr1-release

Change-Id: I7b5cab8c7d24cdeba306229a05c0ca56aeef6425

sdm/libs/hwc2/hwc_layers.cpp

diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index e16d073..85e3e85 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -870,10 +870,9 @@
     return true;
   }
 
-  if (working_primaries == ColorPrimaries_BT709_5 &&
-      layer_->input_buffer.flags.video &&
-      layer_->input_buffer.flags.secure &&
-      layer_->input_buffer.color_metadata.transfer == Transfer_SMPTE_170M ) {
+  if (working_primaries == ColorPrimaries_BT709_5 && layer_->input_buffer.flags.video &&
+      IsBT2020(layer_->input_buffer.color_metadata.colorPrimaries) &&
+      layer_->input_buffer.color_metadata.transfer == Transfer_SMPTE_170M) {
     return true;
   }