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

Commit 4297736f authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: LayerCommand moved to Display Command

Bug: 201008710
Test: VTS
Change-Id: I90d56978b392cd407fe2788b26282422c1f873a7
parent 7eaec5d5
Loading
Loading
Loading
Loading
+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;
@@ -730,18 +730,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();

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,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;