Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge cherrypicks of [3150410, 3150430] into pi-release 

Change-Id: I9d293cb66ed70d098d3f86ecfc005808d07a5cff
This commit is contained in:
android-build-team Robot 2017-10-31 22:07:33 +00:00
parent c005508c5d 6ff95eafef
commit ed597ed466
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
msm8996/sdm/libs/hwc2/hwc_display.cpp
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;
}