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

Commit 6481ebfb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix lshal cannot be run without root"

parents 9753b433 38903c0f

cmds/lshal/Timeout.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ timeoutIPC(const sp<I> &interfaceObject, Function &&func, Args &&... args) { 
    auto boundFunc = std::bind(std::forward<Function>(func),

    auto boundFunc = std::bind(std::forward<Function>(func),

            interfaceObject.get(), std::forward<Args>(args)...);

            interfaceObject.get(), std::forward<Args>(args)...);

    bool success = timeout(IPC_CALL_WAIT, [&ret, &boundFunc] {

    bool success = timeout(IPC_CALL_WAIT, [&ret, &boundFunc] {

        ret = boundFunc();

        ret = std::move(boundFunc());

    });

    });

    if (!success) {

    if (!success) {

        return Status::fromStatusT(TIMED_OUT);

        return Status::fromStatusT(TIMED_OUT);