diff options
author | Peiyong Lin <lpy@google.com> | 2019-04-11 13:50:37 -0700 |
---|---|---|
committer | Peiyong Lin <lpy@google.com> | 2019-04-15 14:04:10 -0700 |
commit | 65c7b60c656c5c96d2cca7d82819546bb655f936 (patch) | |
tree | bbb6053c14de80388e77b19cbf09c3e65e7413c9 /graphics | |
parent | 7ffb10cd8605744d639a0ed2b48b067c08169338 (diff) | |
download | android_hardware_interfaces-65c7b60c656c5c96d2cca7d82819546bb655f936.tar.gz android_hardware_interfaces-65c7b60c656c5c96d2cca7d82819546bb655f936.tar.bz2 android_hardware_interfaces-65c7b60c656c5c96d2cca7d82819546bb655f936.zip |
Deprecate getDisplayBrightnessSupport.
Brightness is already a per display capability, we don't need this API.
BUG: 130313275
Test: build
Change-Id: I0a669aca19a2873df41bee82bd0e5e2775af8101
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/composer/2.3/IComposerClient.hal | 4 | ||||
-rw-r--r-- | graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/graphics/composer/2.3/IComposerClient.hal b/graphics/composer/2.3/IComposerClient.hal index 1eea30652..4d6f78f0b 100644 --- a/graphics/composer/2.3/IComposerClient.hal +++ b/graphics/composer/2.3/IComposerClient.hal @@ -502,6 +502,10 @@ interface IComposerClient extends @2.2::IComposerClient { float minLuminance); /** + * Use getDisplayCapabilities instead. If brightness is supported, must return + * DisplayCapability::BRIGHTNESS as one of the display capabilities via getDisplayCapabilities. + * Only use getDisplayCapabilities as the source of truth to query brightness support. + * * Gets whether brightness operations are supported on a display. * * @param display diff --git a/graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp b/graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp index 56b2e337a..d51c30a30 100644 --- a/graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp +++ b/graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp @@ -572,6 +572,10 @@ TEST_F(GraphicsComposerHidlTest, getDisplayCapabilitiesBasic) { std::find(capabilities.begin(), capabilities.end(), IComposerClient::DisplayCapability::DOZE) != capabilities.end(); EXPECT_EQ(mComposerClient->getDozeSupport(mPrimaryDisplay), hasDozeSupport); + bool hasBrightnessSupport = + std::find(capabilities.begin(), capabilities.end(), + IComposerClient::DisplayCapability::BRIGHTNESS) != capabilities.end(); + EXPECT_EQ(mComposerClient->getDisplayBrightnessSupport(mPrimaryDisplay), hasBrightnessSupport); } TEST_F(GraphicsComposerHidlTest, getDisplayCapabilitiesBadDisplay) { @@ -604,24 +608,18 @@ TEST_F(GraphicsComposerHidlTest, SetLayerPerFrameMetadataBlobs) { } /* - * Test that getDisplayBrightnessSupport works as expected. + * Test that if brightness operations are supported, setDisplayBrightness works as expected. */ -TEST_F(GraphicsComposerHidlTest, getDisplayBrightnessSupport) { +TEST_F(GraphicsComposerHidlTest, setDisplayBrightness) { std::vector<IComposerClient::DisplayCapability> capabilities; const auto error = mComposerClient->getDisplayCapabilities(mPrimaryDisplay, &capabilities); ASSERT_EQ(Error::NONE, error); bool brightnessSupport = std::find(capabilities.begin(), capabilities.end(), IComposerClient::DisplayCapability::BRIGHTNESS) != capabilities.end(); - EXPECT_EQ(mComposerClient->getDisplayBrightnessSupport(mPrimaryDisplay), brightnessSupport); -} - -/* - * Test that if brightness operations are supported, setDisplayBrightness works as expected. - */ -TEST_F(GraphicsComposerHidlTest, setDisplayBrightness) { - if (!mComposerClient->getDisplayBrightnessSupport(mPrimaryDisplay)) { - EXPECT_EQ(mComposerClient->setDisplayBrightness(mPrimaryDisplay, 0.5f), Error::UNSUPPORTED); + if (!brightnessSupport) { + EXPECT_EQ(mComposerClient->getRaw()->setDisplayBrightness(mPrimaryDisplay, 0.5f), + Error::UNSUPPORTED); GTEST_SUCCEED() << "Brightness operations are not supported"; return; } |