Commit c3d73129 authored by Zakhar Voit's avatar Zakhar Voit Committed by Commit Bot

DeviceDisplayResolution: Fix recommended flag being ignored

Recommended flag was ignored (resolution was always forced) when either
internal or external configuration was not set.

Bug: 938859
Change-Id: Ic60bb9b8ca4dac1b00fd396c92aa1f8a9ef85e36
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1505437Reviewed-by: default avatarSergey Poromov <poromov@chromium.org>
Commit-Queue: Zakhar Voit <voit@google.com>
Cr-Commit-Position: refs/heads/master@{#638130}
parent 6d01af74
...@@ -183,11 +183,13 @@ void DisplayResolutionHandler::OnSettingUpdate() { ...@@ -183,11 +183,13 @@ void DisplayResolutionHandler::OnSettingUpdate() {
// We should reset locally stored settings and clear list of already updated // We should reset locally stored settings and clear list of already updated
// displays if any of the policy values were updated. // displays if any of the policy values were updated.
bool should_reset_settings = false; bool should_reset_settings = false;
should_reset_settings |= !new_external_config || should_reset_settings |=
!external_display_settings_ || bool{new_external_config} != bool{external_display_settings_};
should_reset_settings |= new_external_config && external_display_settings_ &&
*new_external_config != *external_display_settings_; *new_external_config != *external_display_settings_;
should_reset_settings |= !new_internal_config || should_reset_settings |=
!internal_display_settings_ || bool{new_internal_config} != bool{internal_display_settings_};
should_reset_settings |= new_internal_config && internal_display_settings_ &&
*new_internal_config != *internal_display_settings_; *new_internal_config != *internal_display_settings_;
should_reset_settings |= recommended_ != new_recommended; should_reset_settings |= recommended_ != new_recommended;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment