commit 6ff95eafefb8ba08e58f3db159af4fe00e69223e
author Courtney Goeltzenleuchter <courtneygo@google.com> Tue Oct 31 12:18:46 2017 -0600
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 31 22:07:28 2017 +0000
tree 92214550e64255294e7295370f0059fa7f03ed5e
parent c005508c5d6880b15ffdeb85758bb2b7b15654db

Revert "hwc2: Do not reapply mode if it is the same as before"

This CL is causing the Accessibility -> Color inversion option
to not do anything.
Bug: b/63111041
Bug: b/67488442
Bug: b/68129004
Test: manual: Go to Settings -> Accessibility and toggle Color
inversion. Should be obvious change on the screen.

This reverts commit e234d576541763d99828ce22471a428eee059a83.

Change-Id: I3874612a47d278d8927bfd1f89d07a79ebb4d4cc
(cherry picked from commit 23beb6bfbebbd1076e046cca450f2775b896e37e)

msm8996/sdm/libs/hwc2/hwc_display.cpp

diff --git a/msm8996/sdm/libs/hwc2/hwc_display.cpp b/msm8996/sdm/libs/hwc2/hwc_display.cpp
index 477cb88..10b2220 100644
--- a/msm8996/sdm/libs/hwc2/hwc_display.cpp
+++ b/msm8996/sdm/libs/hwc2/hwc_display.cpp
@@ -135,7 +135,7 @@
 
   // if the mode count is 1, then only native mode is supported, so just apply matrix w/o
   // setting mode
-  if (color_mode_transform_map_.size() > 1U && current_color_mode_ != mode) {
+  if (color_mode_transform_map_.size() > 1U) {
     color_mode_transform = color_mode_transform_map_[mode][transform_hint];
     DisplayError error = display_intf_->SetColorMode(color_mode_transform);
     if (error != kErrorNone) {
@@ -143,7 +143,6 @@
       // failure to force client composition
       return HWC2::Error::Unsupported;
     }
-    DLOGI("Setting Color Mode = %d Transform Hint = %d Success", mode, hint);
   }
 
   if (use_matrix) {
@@ -158,6 +157,8 @@
   current_color_mode_ = mode;
   current_color_transform_ = hint;
   CopyColorTransformMatrix(matrix, color_matrix_);
+  DLOGV_IF(kTagQDCM, "Setting Color Mode = %d Transform Hint = %d Success", mode, hint);
+
   return HWC2::Error::None;
 }