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

Commit 5724365d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Clean up warnings around AidlComposer.{h,cpp}" into main

parents 76b68a48 6275776b

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+9 −4
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ 


namespace android {



using hardware::hidl_handle;

using hardware::hidl_vec;

using hardware::Return;



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

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

using aidl::android::hardware::graphics::composer3::ClientTargetPropertyWithBrightness;
@@ -524,11 +520,15 @@ Error AidlComposer::getColorModes(Display display, std::vector<ColorMode>* outMo 


Error AidlComposer::getDisplayAttribute(Display display, Config config,

                                        IComposerClient::Attribute attribute, int32_t* outValue) {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    const auto status =

            mAidlComposerClient->getDisplayAttribute(translate<int64_t>(display),

                                                     translate<int32_t>(config),

                                                     static_cast<AidlDisplayAttribute>(attribute),

                                                     outValue);

#pragma clang diagnostic pop



    if (!status.isOk()) {

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

        return static_cast<Error>(status.getServiceSpecificError());
@@ -538,8 +538,13 @@ Error AidlComposer::getDisplayAttribute(Display display, Config config, 


Error AidlComposer::getDisplayConfigs(Display display, std::vector<Config>* outConfigs) {

    std::vector<int32_t> configs;



#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wdeprecated-declarations"

    const auto status =

            mAidlComposerClient->getDisplayConfigs(translate<int64_t>(display), &configs);

#pragma clang diagnostic pop



    if (!status.isOk()) {

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

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

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+0 −8
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ 
#include <utility>

#include <vector>



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

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"



#include <android/hardware/graphics/composer/2.4/IComposer.h>

#include <android/hardware/graphics/composer/2.4/IComposerClient.h>
@@ -43,9 +38,6 @@ 
#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"



namespace android::Hwc2 {



using aidl::android::hardware::graphics::common::DisplayDecorationSupport;