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

Commit 87e8527c authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: LayerCommand moved to Display Command"

parents cb96eab7 4297736f

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+6 −11
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ using aidl::android::hardware::graphics::composer3::Capability; 
using aidl::android::hardware::graphics::composer3::PowerMode;

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



using aidl::android::hardware::graphics::composer3::command::CommandResultPayload;

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



using AidlColorMode = aidl::android::hardware::graphics::composer3::ColorMode;

using AidlContentType = aidl::android::hardware::graphics::composer3::ContentType;
@@ -728,18 +728,13 @@ Error AidlComposer::execute() { 
        }



        const auto& command = commands[index];

        if (command.getTag() == command::CommandPayload::Tag::displayCommand) {

            const auto& displayCommand =

                    command.get<command::CommandPayload::Tag::displayCommand>();

            if (displayCommand.validateDisplay || displayCommand.presentDisplay ||

                displayCommand.presentOrValidateDisplay) {

        if (command.validateDisplay || command.presentDisplay || command.presentOrValidateDisplay) {

            error = translate<Error>(cmdErr.errorCode);

        } else {

            ALOGW("command '%s' generated error %" PRId32, command.toString().c_str(),

                  cmdErr.errorCode);

        }

    }

    }



    mWriter.reset();

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ namespace android::Hwc2 { 


using AidlCommandWriterBase = aidl::android::hardware::graphics::composer3::CommandWriterBase;

using AidlCommandReaderBase = aidl::android::hardware::graphics::composer3::CommandReaderBase;

using aidl::android::hardware::graphics::composer3::command::CommandResultPayload;



class AidlIComposerCallbackWrapper;