diff options
| author | Ramkumar Radhakrishnan <ramkumar@codeaurora.org> | 2018-03-28 15:20:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-04-04 15:21:33 -0700 |
| commit | cd01c62eb06d01e81389450250fce4ba3cfa0f38 (patch) | |
| tree | f7b8e6abb14ff45ef2d27ee6400085ae126033e1 /sdm | |
| parent | 0bd1c5d9f93f887c66deef760fcd133b37d74a70 (diff) | |
| download | android_hardware_qcom_sdm710_display-cd01c62eb06d01e81389450250fce4ba3cfa0f38.tar.gz android_hardware_qcom_sdm710_display-cd01c62eb06d01e81389450250fce4ba3cfa0f38.tar.bz2 android_hardware_qcom_sdm710_display-cd01c62eb06d01e81389450250fce4ba3cfa0f38.zip | |
hwc2: Fix VTS failure on setActiveConfig() testcase
New resolution mode being set as a part of next commit, if
getActiveConfig() is called before the next commit sdm provides
the old config that results in VTS failure. Hence return the pending
config instead of the current config.
Change-Id: I18660916dae1c9fc8b3390afed1b94d8448f5966
CRs-Fixed: 2211483
Diffstat (limited to 'sdm')
| -rw-r--r-- | sdm/libs/hwc2/hwc_display.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp index 0b5676ad..3b228b88 100644 --- a/sdm/libs/hwc2/hwc_display.cpp +++ b/sdm/libs/hwc2/hwc_display.cpp @@ -1990,6 +1990,10 @@ int HWCDisplay::SetActiveDisplayConfig(uint32_t config) { } int HWCDisplay::GetActiveDisplayConfig(uint32_t *config) { + if (config_pending_) { + *config = display_config_; + return 0; + } return display_intf_->GetActiveConfig(config) == kErrorNone ? 0 : -1; } |