tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" am: b350c7cf49

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1830034

Change-Id: I04075d9e644eebc0b1e7235344a2090c80cb2556
This commit is contained in:
Treehugger Robot 2021-10-18 21:53:16 +00:00 committed by Automerger Merge Worker
commit 3741e92674
1 changed files with 0 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp
View file

@ -19,8 +19,6 @@
#include <algorithm>
#include <regex>
#include <thread>
#include <unordered_map>
#include <utility>
#include <android-base/logging.h>
#include <android-base/properties.h>
@ -317,59 +315,6 @@ TEST_P(GraphicsComposerHidlTest, GetDisplayAttribute_2_4) {
}
}
TEST_P(GraphicsComposerHidlTest, GetDisplayAttribute_2_4_ConfigsInAGroupDifferOnlyByVsyncPeriod) {
struct Resolution {
int32_t width, height;
};
struct Dpi {
int32_t x, y;
};
for (const auto& display : mDisplays) {
std::vector<Config> configs = mComposerClient->getDisplayConfigs(display.get());
std::unordered_map<int32_t, Resolution> configGroupToResolutionMap;
std::unordered_map<int32_t, Dpi> configGroupToDpiMap;
for (auto config : configs) {
const auto configGroup = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::CONFIG_GROUP);
const auto width = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::WIDTH);
const auto height = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::HEIGHT);
if (configGroupToResolutionMap.find(configGroup) == configGroupToResolutionMap.end()) {
configGroupToResolutionMap[configGroup] = {width, height};
}
EXPECT_EQ(configGroupToResolutionMap[configGroup].width, width);
EXPECT_EQ(configGroupToResolutionMap[configGroup].height, height);
int32_t dpiX = -1;
mComposerClient->getRaw()->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::DPI_X,
[&](const auto& tmpError, const auto& value) {
if (tmpError == Error::NONE) {
dpiX = value;
}
});
int32_t dpiY = -1;
mComposerClient->getRaw()->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::DPI_Y,
[&](const auto& tmpError, const auto& value) {
if (tmpError == Error::NONE) {
dpiY = value;
}
});
if (dpiX == -1 && dpiY == -1) {
continue;
}
if (configGroupToDpiMap.find(configGroup) == configGroupToDpiMap.end()) {
configGroupToDpiMap[configGroup] = {dpiX, dpiY};
}
EXPECT_EQ(configGroupToDpiMap[configGroup].x, dpiX);
EXPECT_EQ(configGroupToDpiMap[configGroup].y, dpiY);
}
}
}
TEST_P(GraphicsComposerHidlTest, getDisplayVsyncPeriod_BadDisplay) {
VsyncPeriodNanos vsyncPeriodNanos;
EXPECT_EQ(Error::BAD_DISPLAY,