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

Commit 75a83966 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: use aidl Capability"

parents 391d6749 de549d4f

services/surfaceflinger/CompositionEngine/src/Display.cpp

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include "DisplayHardware/PowerAdvisor.h"



using aidl::android::hardware::graphics::composer3::Capability;

using aidl::android::hardware::graphics::composer3::DisplayCapability;



namespace android::compositionengine::impl {
@@ -284,7 +285,7 @@ bool Display::getSkipColorTransform() const { 
                                        DisplayCapability::SKIP_CLIENT_COLOR_TRANSFORM);

    }



    return hwc.hasCapability(hal::Capability::SKIP_CLIENT_COLOR_TRANSFORM);

    return hwc.hasCapability(Capability::SKIP_CLIENT_COLOR_TRANSFORM);

}



bool Display::anyLayersRequireClientComposition() const {

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include <aidl/android/hardware/graphics/composer3/Composition.h>



using aidl::android::hardware::graphics::composer3::Capability;

using aidl::android::hardware::graphics::composer3::Composition;



namespace android::compositionengine {
@@ -672,7 +673,7 @@ using DisplayGetSkipColorTransformTest = DisplayWithLayersTestCommon; 
using aidl::android::hardware::graphics::composer3::DisplayCapability;



TEST_F(DisplayGetSkipColorTransformTest, checksCapabilityIfGpuDisplay) {

    EXPECT_CALL(mHwComposer, hasCapability(hal::Capability::SKIP_CLIENT_COLOR_TRANSFORM))

    EXPECT_CALL(mHwComposer, hasCapability(Capability::SKIP_CLIENT_COLOR_TRANSFORM))

            .WillOnce(Return(true));

    auto args = getDisplayCreationArgsForGpuVirtualDisplay();

    auto gpuDisplay{impl::createDisplay(mCompositionEngine, args)};

services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ public: 
    MOCK_METHOD1(setCallback, void(HWC2::ComposerCallback&));

    MOCK_CONST_METHOD3(getDisplayIdentificationData,

                       bool(hal::HWDisplayId, uint8_t*, DisplayIdentificationData*));

    MOCK_CONST_METHOD1(hasCapability, bool(hal::Capability));

    MOCK_CONST_METHOD1(hasCapability,

                       bool(aidl::android::hardware::graphics::composer3::Capability));

    MOCK_CONST_METHOD2(hasDisplayCapability,

                       bool(HalDisplayId,

                            aidl::android::hardware::graphics::composer3::DisplayCapability));

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -251,14 +251,14 @@ bool AidlComposer::isSupported(OptionalFeature feature) const { 
    }

}



std::vector<IComposer::Capability> AidlComposer::getCapabilities() {

std::vector<Capability> AidlComposer::getCapabilities() {

    std::vector<Capability> capabilities;

    const auto status = mAidlComposer->getCapabilities(&capabilities);

    if (!status.isOk()) {

        ALOGE("getCapabilities failed %s", status.getDescription().c_str());

        return {};

    }

    return translate<IComposer::Capability>(capabilities);

    return capabilities;

}



std::string AidlComposer::dumpDebugInfo() {

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ public: 


    bool isSupported(OptionalFeature) const;



    std::vector<IComposer::Capability> getCapabilities() override;

    std::vector<aidl::android::hardware::graphics::composer3::Capability> getCapabilities()

            override;

    std::string dumpDebugInfo() override;



    void registerCallback(HWC2::ComposerCallback& callback) override;