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

Commit ca7cf39c authored by Alec Mouri's avatar Alec Mouri Committed by Automerger Merge Worker
Browse files

Merge "Send brightness nits to composer" into tm-dev am: da91f729 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17352457



Change-Id: Iaff0c39c2bfe00e42100ad7f227eb058ab348d61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebc815a7 da91f729

graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientWriter.h

+3 −2
Original line number Diff line number Diff line
@@ -80,8 +80,9 @@ class ComposerClientWriter { 
        getDisplayCommand(display).colorTransformMatrix.emplace(std::move(matVec));

    }



    void setDisplayBrightness(int64_t display, float brightness) {

        getDisplayCommand(display).brightness.emplace(DisplayBrightness{.brightness = brightness});

    void setDisplayBrightness(int64_t display, float brightness, float brightnessNits) {

        getDisplayCommand(display).brightness.emplace(

                DisplayBrightness{.brightness = brightness, .brightnessNits = brightnessNits});

    }



    void setClientTarget(int64_t display, uint32_t slot, const native_handle_t* target,

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ TEST_P(GraphicsCompositionTest, SetLayerBrightnessDims) { 
    // Preconditions to successfully run are knowing the max brightness and successfully applying

    // the max brightness

    ASSERT_GT(maxBrightnessNits, 0.f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 1.f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 1.f, maxBrightnessNits);

    execute();

    ASSERT_TRUE(mReader.takeErrors().empty());

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+7 −7
Original line number Diff line number Diff line
@@ -1374,7 +1374,7 @@ TEST_P(GraphicsComposerAidlCommandTest, SetDisplayBrightness) { 
    bool brightnessSupport = std::find(capabilities.begin(), capabilities.end(),

                                       DisplayCapability::BRIGHTNESS) != capabilities.end();

    if (!brightnessSupport) {

        mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.5f);

        mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.5f, -1.f);

        execute();

        const auto errors = mReader.takeErrors();

        EXPECT_EQ(1, errors.size());
@@ -1383,23 +1383,23 @@ TEST_P(GraphicsComposerAidlCommandTest, SetDisplayBrightness) { 
        return;

    }



    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.0f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.0f, -1.f);

    execute();

    EXPECT_TRUE(mReader.takeErrors().empty());



    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.5f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.5f, -1.f);

    execute();

    EXPECT_TRUE(mReader.takeErrors().empty());



    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 1.0f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 1.0f, -1.f);

    execute();

    EXPECT_TRUE(mReader.takeErrors().empty());



    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ -1.0f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ -1.0f, -1.f);

    execute();

    EXPECT_TRUE(mReader.takeErrors().empty());



    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 2.0f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 2.0f, -1.f);

    execute();

    {

        const auto errors = mReader.takeErrors();
@@ -1407,7 +1407,7 @@ TEST_P(GraphicsComposerAidlCommandTest, SetDisplayBrightness) { 
        EXPECT_EQ(IComposerClient::EX_BAD_PARAMETER, errors[0].errorCode);

    }



    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ -2.0f);

    mWriter.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ -2.0f, -1.f);

    execute();

    {

        const auto errors = mReader.takeErrors();