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

Commit a999f0aa authored by Peiyong Lin's avatar Peiyong Lin Committed by android-build-merger
Browse files

Merge "[SurfaceFlinger] Remove getDisplayBrightnessSupport." into qt-dev 

am: aa45ab58

Change-Id: I91887e81a7402745792e699f04051a399a11da3c
parents f063e270 aa45ab58

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+0 −17
Original line number Diff line number Diff line
@@ -1158,23 +1158,6 @@ Error Composer::setLayerPerFrameMetadataBlobs( 
    return Error::NONE;

}



Error Composer::getDisplayBrightnessSupport(Display display, bool* outSupport) {

    if (!mClient_2_3) {

        return Error::UNSUPPORTED;

    }

    Error error = kDefaultError;

    mClient_2_3->getDisplayBrightnessSupport(display,

                                             [&](const auto& tmpError, const auto& tmpSupport) {

                                                 error = tmpError;

                                                 if (error != Error::NONE) {

                                                     return;

                                                 }



                                                 *outSupport = tmpSupport;

                                             });

    return error;

}



Error Composer::setDisplayBrightness(Display display, float brightness) {

    if (!mClient_2_3) {

        return Error::UNSUPPORTED;

services/surfaceflinger/DisplayHardware/ComposerHal.h

+0 −2
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ public: 
                                         std::vector<DisplayCapability>* outCapabilities) = 0;

    virtual Error setLayerPerFrameMetadataBlobs(

            Display display, Layer layer, const std::vector<PerFrameMetadataBlob>& metadata) = 0;

    virtual Error getDisplayBrightnessSupport(Display display, bool* outSupport) = 0;

    virtual Error setDisplayBrightness(Display display, float brightness) = 0;

};
@@ -416,7 +415,6 @@ public: 
    Error setLayerPerFrameMetadataBlobs(

            Display display, Layer layer,

            const std::vector<IComposerClient::PerFrameMetadataBlob>& metadata) override;

    Error getDisplayBrightnessSupport(Display display, bool* outSupport) override;

    Error setDisplayBrightness(Display display, float brightness) override;



private:

services/surfaceflinger/DisplayHardware/HWC2.cpp

+0 −5
Original line number Diff line number Diff line
@@ -276,11 +276,6 @@ Display::Display(android::Hwc2::Composer& composer, 
        if (error == Error::None && dozeSupport) {

            mDisplayCapabilities.emplace(DisplayCapability::Doze);

        }

        bool brightnessSupport = false;

        error = static_cast<Error>(mComposer.getDisplayBrightnessSupport(mId, &brightnessSupport));

        if (error == Error::None && brightnessSupport) {

            mDisplayCapabilities.emplace(DisplayCapability::Brightness);

        }

    }

    ALOGV("Created display %" PRIu64, id);

}

services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ public: 
    MOCK_METHOD3(setLayerPerFrameMetadataBlobs,

                 Error(Display, Layer, const std::vector<IComposerClient::PerFrameMetadataBlob>&));

    MOCK_METHOD2(setDisplayBrightness, Error(Display, float));

    MOCK_METHOD2(getDisplayBrightnessSupport, Error(Display, bool*));

};



} // namespace mock