commit c1ae13ed156e826fb5b3a237843ce87eabdd1c6f
author Yifan Hong <elsk@google.com> Sat Feb 18 01:21:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 18 01:21:37 2017 +0000
tree c0aebd4e8eac01cbbc3643df758db6d0533b728b
parent e0b184f8c9652d5b67a9b20b2ac1a74304b08416
parent b40360f7c391fd3fe1359c621760c19f3e144804

Merge "Fix lshal cannot be run without root" am: 6481ebfbc3 am: 8d6362fc44
am: b40360f7c3

Change-Id: Id53e3d9648060bbdecc5f1b67d4ac85183162740

cmds/lshal/Timeout.h

diff --git a/cmds/lshal/Timeout.h b/cmds/lshal/Timeout.h
index bf883c0..001c3d6 100644
--- a/cmds/lshal/Timeout.h
+++ b/cmds/lshal/Timeout.h
@@ -69,7 +69,7 @@
     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);