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

Commit 5db7a8d5 authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Automerger Merge Worker
Browse files

Merge changes from topics "presubmit-am-5b86c75ec52142ad9dfd0837f3fad249",... 

Merge changes from topics "presubmit-am-5b86c75ec52142ad9dfd0837f3fad249", "presubmit-am-c314b40f446d47e6aa51654f7a3e4f49" into tm-dev am: 1a56d1f7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17069807

Change-Id: I148bdb3c578bc7c5fba7b6743542791c6d2fd37c
parents 46ca8f7a 1a56d1f7

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ void BufferLayer::onPostComposition(const DisplayDevice* display, 
    }



    if (display) {

        const Fps refreshRate = display->refreshRateConfigs().getCurrentRefreshRate().getFps();

        const Fps refreshRate = display->refreshRateConfigs().getActiveMode()->getFps();

        const std::optional<Fps> renderRate =

                mFlinger->mScheduler->getFrameRateOverride(getOwnerUid());

services/surfaceflinger/CompositionEngine/include/compositionengine/Display.h

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ public: 
    // similar requests if needed.

    virtual void createClientCompositionCache(uint32_t cacheSize) = 0;



    // Returns the boot display mode preferred by HWC.

    virtual int32_t getPreferredBootHwcConfigId() const = 0;



protected:

    ~Display() = default;

};

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h

+0 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public: 
    bool isSecure() const override;

    bool isVirtual() const override;

    void disconnect() override;

    int32_t getPreferredBootHwcConfigId() const override;

    void createDisplayColorProfile(

            const compositionengine::DisplayColorProfileCreationArgs&) override;

    void createRenderSurface(const compositionengine::RenderSurfaceCreationArgs&) override;
@@ -88,7 +87,6 @@ private: 
    DisplayId mId;

    bool mIsDisconnected = false;

    Hwc2::PowerAdvisor* mPowerAdvisor = nullptr;

    int32_t mPreferredBootHwcConfigId = -1;

};



// This template factory function standardizes the implementation details of the

services/surfaceflinger/CompositionEngine/src/Display.cpp

+0 −14
Original line number Diff line number Diff line
@@ -58,16 +58,6 @@ void Display::setConfiguration(const compositionengine::DisplayCreationArgs& arg 
    editState().isSecure = args.isSecure;

    editState().displaySpace.setBounds(args.pixels);

    setName(args.name);

    bool isBootModeSupported = getCompositionEngine().getHwComposer().getBootDisplayModeSupport();

    const auto physicalId = PhysicalDisplayId::tryCast(mId);

    if (!physicalId || !isBootModeSupported) {

        return;

    }

    std::optional<hal::HWConfigId> preferredBootModeId =

            getCompositionEngine().getHwComposer().getPreferredBootDisplayMode(*physicalId);

    if (preferredBootModeId.has_value()) {

        mPreferredBootHwcConfigId = static_cast<int32_t>(preferredBootModeId.value());

    }

}



bool Display::isValid() const {
@@ -90,10 +80,6 @@ std::optional<DisplayId> Display::getDisplayId() const { 
    return mId;

}



int32_t Display::getPreferredBootHwcConfigId() const {

    return mPreferredBootHwcConfigId;

}



void Display::disconnect() {

    if (mIsDisconnected) {

        return;

services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ public: 
    MOCK_METHOD1(getPreferredBootDisplayMode, std::optional<hal::HWConfigId>(PhysicalDisplayId));

    MOCK_METHOD0(getBootDisplayModeSupport, bool());

    MOCK_METHOD2(setAutoLowLatencyMode, status_t(PhysicalDisplayId, bool));

    MOCK_METHOD2(getSupportedContentTypes,

                 status_t(PhysicalDisplayId, std::vector<hal::ContentType>*));

    MOCK_METHOD(status_t, getSupportedContentTypes,

                (PhysicalDisplayId, std::vector<hal::ContentType>*), (const, override));

    MOCK_METHOD2(setContentType, status_t(PhysicalDisplayId, hal::ContentType));

    MOCK_CONST_METHOD0(getSupportedLayerGenericMetadata,

                       const std::unordered_map<std::string, bool>&());