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

Commit d224ed7f authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "Make getBootDisplayModeSupport feature optional in aidl composer" into tm-dev am: bf9cc042 

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

Change-Id: Idc37e86ce09eaadd810417f2b47028f8f0ff8d8a
parents 33e8e135 bf9cc042

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct DisplayTestCommon : public testing::Test { 
        EXPECT_CALL(mCompositionEngine, getRenderEngine()).WillRepeatedly(ReturnRef(mRenderEngine));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

        EXPECT_CALL(mHwComposer, getBootDisplayModeSupport()).WillRepeatedly(Return(false));

    }



    DisplayCreationArgs getDisplayCreationArgsForPhysicalDisplay() {

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+0 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ bool AidlComposer::isSupported(OptionalFeature feature) const { 
        case OptionalFeature::RefreshRateSwitching:

        case OptionalFeature::ExpectedPresentTime:

        case OptionalFeature::DisplayBrightnessCommand:

        case OptionalFeature::BootDisplayConfig:

        case OptionalFeature::KernelIdleTimer:

        case OptionalFeature::PhysicalDisplayOrientation:

            return true;

services/surfaceflinger/DisplayHardware/ComposerHal.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ public: 
        ExpectedPresentTime,

        // Whether setDisplayBrightness is able to be applied as part of a display command.

        DisplayBrightnessCommand,

        BootDisplayConfig,

        KernelIdleTimer,

        PhysicalDisplayOrientation,

    };

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+0 −4
Original line number Diff line number Diff line
@@ -740,10 +740,6 @@ std::future<status_t> HWComposer::setDisplayBrightness( 
            });

}



bool HWComposer::getBootDisplayModeSupport() {

    return mComposer->isSupported(Hwc2::Composer::OptionalFeature::BootDisplayConfig);

}



status_t HWComposer::setBootDisplayMode(PhysicalDisplayId displayId,

                                        hal::HWConfigId displayModeId) {

    RETURN_IF_INVALID_DISPLAY(displayId, BAD_INDEX);

services/surfaceflinger/DisplayHardware/HWComposer.h

+0 −2
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ public: 
    virtual std::optional<hal::HWDisplayId> fromPhysicalDisplayId(PhysicalDisplayId) const = 0;



    // Composer 3.0

    virtual bool getBootDisplayModeSupport() = 0;

    virtual status_t setBootDisplayMode(PhysicalDisplayId, hal::HWConfigId) = 0;

    virtual status_t clearBootDisplayMode(PhysicalDisplayId) = 0;

    virtual std::optional<hal::HWConfigId> getPreferredBootDisplayMode(PhysicalDisplayId) = 0;
@@ -406,7 +405,6 @@ public: 
    const std::unordered_map<std::string, bool>& getSupportedLayerGenericMetadata() const override;



    // Composer 3.0

    bool getBootDisplayModeSupport() override;

    status_t setBootDisplayMode(PhysicalDisplayId, hal::HWConfigId) override;

    status_t clearBootDisplayMode(PhysicalDisplayId) override;

    std::optional<hal::HWConfigId> getPreferredBootDisplayMode(PhysicalDisplayId) override;