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

Commit f797decf authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "surfaceflinger: handle executeCommands transaction errors" into oc-mr1-dev 

am: f7e10c82

Change-Id: I02f1e3e8cb4f8c31e2959be375b8cac31c94601d
parents 878a9b16 f7e10c82

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+6 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ Error Composer::execute() 
    }



    Error error = kDefaultError;

    mClient->executeCommands(commandLength, commandHandles,

    auto ret = mClient->executeCommands(commandLength, commandHandles,

            [&](const auto& tmpError, const auto& tmpOutChanged,

                const auto& tmpOutLength, const auto& tmpOutHandles)

            {
@@ -784,6 +784,11 @@ Error Composer::execute() 
                    error = Error::NO_RESOURCES;

                }

            });

    // executeCommands can fail because of out-of-fd and we do not want to

    // abort() in that case

    if (!ret.isOk()) {

        ALOGE("executeCommands failed because of %s", ret.description().c_str());

    }



    if (error == Error::NONE) {

        std::vector<CommandReader::CommandError> commandErrors =