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

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

Merge changes from topic "AIDL_DisplayCapability" 

* changes:
  Add to_string(DisplayCapability)
  Switch from HIDL DisplayCapability to AIDL
parents 79a14ede 515f0383

services/surfaceflinger/CompositionEngine/src/Display.cpp

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 


#include "DisplayHardware/PowerAdvisor.h"



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



namespace android::compositionengine::impl {



std::shared_ptr<Display> createDisplay(
@@ -252,7 +254,7 @@ bool Display::getSkipColorTransform() const { 
    const auto& hwc = getCompositionEngine().getHwComposer();

    if (const auto halDisplayId = HalDisplayId::tryCast(mId)) {

        return hwc.hasDisplayCapability(*halDisplayId,

                                        hal::DisplayCapability::SKIP_CLIENT_COLOR_TRANSFORM);

                                        DisplayCapability::SKIP_CLIENT_COLOR_TRANSFORM);

    }



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

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -634,6 +634,7 @@ TEST_F(DisplayChooseCompositionStrategyTest, normalOperationWithChanges) { 
 */



using DisplayGetSkipColorTransformTest = DisplayWithLayersTestCommon;

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



TEST_F(DisplayGetSkipColorTransformTest, checksCapabilityIfGpuDisplay) {

    EXPECT_CALL(mHwComposer, hasCapability(hal::Capability::SKIP_CLIENT_COLOR_TRANSFORM))
@@ -646,7 +647,7 @@ TEST_F(DisplayGetSkipColorTransformTest, checksCapabilityIfGpuDisplay) { 
TEST_F(DisplayGetSkipColorTransformTest, checksDisplayCapability) {

    EXPECT_CALL(mHwComposer,

                hasDisplayCapability(HalDisplayId(DEFAULT_DISPLAY_ID),

                                     hal::DisplayCapability::SKIP_CLIENT_COLOR_TRANSFORM))

                                     DisplayCapability::SKIP_CLIENT_COLOR_TRANSFORM))

            .WillOnce(Return(true));

    EXPECT_TRUE(mDisplay->getSkipColorTransform());

}

services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ public: 
    MOCK_CONST_METHOD3(getDisplayIdentificationData,

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

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

    MOCK_CONST_METHOD2(hasDisplayCapability, bool(HalDisplayId, hal::DisplayCapability));

    MOCK_CONST_METHOD2(hasDisplayCapability,

                       bool(HalDisplayId,

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



    MOCK_CONST_METHOD0(getMaxVirtualDisplayCount, size_t());

    MOCK_CONST_METHOD0(getMaxVirtualDisplayDimension, size_t());

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+4 −5
Original line number Diff line number Diff line
@@ -917,15 +917,14 @@ Error AidlComposer::setDisplayBrightness(Display display, float brightness) { 
}



Error AidlComposer::getDisplayCapabilities(Display display,

                                           std::vector<DisplayCapability>* outCapabilities) {

    std::vector<AidlDisplayCapability> capabilities;

    const auto status =

            mAidlComposerClient->getDisplayCapabilities(translate<int64_t>(display), &capabilities);

                                           std::vector<AidlDisplayCapability>* outCapabilities) {

    const auto status = mAidlComposerClient->getDisplayCapabilities(translate<int64_t>(display),

                                                                    outCapabilities);

    if (!status.isOk()) {

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

        outCapabilities->clear();

        return static_cast<Error>(status.getServiceSpecificError());

    }

    *outCapabilities = translate<DisplayCapability>(capabilities);

    return Error::NONE;

}

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+5 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <android/hardware/graphics/composer3/ComposerClientWriter.h>



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

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



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion -Wextra"
@@ -182,8 +183,10 @@ public: 
    Error setDisplayBrightness(Display display, float brightness) override;



    // Composer HAL 2.4

    Error getDisplayCapabilities(Display display,

                                 std::vector<DisplayCapability>* outCapabilities) override;

    Error getDisplayCapabilities(

            Display display,

            std::vector<aidl::android::hardware::graphics::composer3::DisplayCapability>*

                    outCapabilities) override;

    V2_4::Error getDisplayConnectionType(Display display,

                                         IComposerClient::DisplayConnectionType* outType) override;

    V2_4::Error getDisplayVsyncPeriod(Display display, VsyncPeriodNanos* outVsyncPeriod) override;