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

Commit c1ae13ed authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Fix lshal cannot be run without root" am: 6481ebfb am: 8d6362fc

am: b40360f7

Change-Id: Id53e3d9648060bbdecc5f1b67d4ac85183162740
parents e0b184f8 b40360f7
Loading
Loading
Loading
Loading
+1 −1
Original line number 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),
            interfaceObject.get(), std::forward<Args>(args)...);
    bool success = timeout(IPC_CALL_WAIT, [&ret, &boundFunc] {
        ret = boundFunc();
        ret = std::move(boundFunc());
    });
    if (!success) {
        return Status::fromStatusT(TIMED_OUT);