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 e234d57654.

Change-Id: I3874612a47d278d8927bfd1f89d07a79ebb4d4cc
(cherry picked from commit 23beb6bfbe)
This commit is contained in:
Courtney Goeltzenleuchter 2017-10-31 12:18:46 -06:00 committed by android-build-team Robot
parent c005508c5d
commit 6ff95eafef
1 changed files with 3 additions and 2 deletions

View File

@ -135,7 +135,7 @@ HWC2::Error HWCColorMode::HandleColorModeTransform(android_color_mode_t mode,
// 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 @@ HWC2::Error HWCColorMode::HandleColorModeTransform(android_color_mode_t mode,
// 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 @@ HWC2::Error HWCColorMode::HandleColorModeTransform(android_color_mode_t mode,
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;
}