commit 48e83a152179d5fe45dbef2ec7efc509f5f3adc4
author Yifan Hong <elsk@google.com> Tue Oct 03 14:10:07 2017 -0700
committer Yifan Hong <elsk@google.com> Tue Oct 03 15:47:22 2017 -0700
tree 7f6811436241cb8407f527893881b712d7160018
parent 625d6a8cd8e093f85aea394865c970997ca33767

Dumpstate: lshal runs in non-root in user build

lshal output is still useful even without root permission,
so include it in user build as well.

Test: lshal in user build
Test: dumpstate_test
Test: DumpstateTest.RunCommandAsRootIfAvailableOnUserBuild
Test: DumpstateTest.RunCommandAsRootIfAvailableOnDebugBuild
Test: DumpstateUtilTest.RunCommandAsRootIfAvailableOnDebugBuild
Test: DumpstateUtilTest.RunCommandAsRootIfAvailableOnUserBuild

Change-Id: Ie8ba9206feb6c2947ed38159ec9893e85d0e020d
Fixes: 66476950

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index f84d86d..24b4c99 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -972,14 +972,15 @@
         RunCommand(
                 "HARDWARE HALS",
                 {"lshal", std::string("--debug=") + kLsHalDebugPath},
-                CommandOptions::AS_ROOT);
+                CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());
 
         ds.AddZipEntry("lshal-debug.txt", kLsHalDebugPath);
 
         unlink(kLsHalDebugPath.c_str());
     } else {
         RunCommand(
-                "HARDWARE HALS", {"lshal", "--debug"}, CommandOptions::AS_ROOT);
+                "HARDWARE HALS", {"lshal", "--debug"},
+                CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());
     }
 
     RunCommand("PRINTENV", {"printenv"});