Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c7b60c authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Deprecate getDisplayBrightnessSupport. 

Brightness is already a per display capability, we don't need this API.

BUG: 130313275
Test: build
Change-Id: I0a669aca19a2873df41bee82bd0e5e2775af8101
parent 7ffb10cd

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ b826892686850a9cf2b60ca5845db7185c2196ea4dd765cd80cd163169678a78 android.hardwar 
01c6398c90fc6be0640810e2c5d8a4863b457280132bb3f97dd5682e19632b62 android.hardware.graphics.bufferqueue@2.0::types

7a2d64095252f85781b2d521f4f11d04ce774544feececcec2088c568656e93c android.hardware.graphics.common@1.2::types

3dff04a36b86660b5807414587e530bb0c294ed56fdff06f8915ba0a9b73f974 android.hardware.graphics.composer@2.3::IComposer

54bc1dc874f8bc0781767786075dafd33a0796c1eea7d2317231b8929280e946 android.hardware.graphics.composer@2.3::IComposerClient

b2b0ef3e6f5e9bb4aa6e978bc62e017b3fd64dba95a2152e8b07e3b7c4581d4f android.hardware.graphics.composer@2.3::IComposerClient

033e096cb65e5093ee1d0e473892b9a487911d4611dbb65ebecb5cef18338923 android.hardware.graphics.mapper@3.0::IMapper

7183d9d9acfa41a61a64bdfed548e98299265a7bb1821a3ed204173b5c2cfd4a android.hardware.graphics.mapper@3.0::types

c3f831a66d5815baf74f5b82fe79cf099542ddae4dfab3f388e1d41828e794fc android.hardware.health.storage@1.0::IGarbageCollectCallback

graphics/composer/2.3/IComposerClient.hal

+4 −0
Original line number Diff line number Diff line
@@ -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

graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp

+9 −11
Original line number Diff line number Diff line
@@ -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;

    }