commit 6d24dd590f10cd446af6b254633e77be13f3355c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 07 17:44:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 07 17:44:53 2016 +0000
tree bc307949b5556ce4b624bddda7bb8297ef77ae9a
parent 54c66836219f8b69482cd8de5c6a79473342a1b0
parent 26c4157a0823688ba78bf29d93fbce0def3a0fa6

Merge "Fixed RunCommandDropRoot when running as Shell."

cmds/dumpstate/tests/dumpstate_test.cpp

diff --git a/cmds/dumpstate/tests/dumpstate_test.cpp b/cmds/dumpstate/tests/dumpstate_test.cpp
index 782230a..8d70704 100644
--- a/cmds/dumpstate/tests/dumpstate_test.cpp
+++ b/cmds/dumpstate/tests/dumpstate_test.cpp
@@ -319,7 +319,7 @@
     EXPECT_EQ(0, RunCommand("", {simpleCommand, "--uid"},
                             CommandOptions::WithTimeout(1).DropRoot().Build()));
     EXPECT_THAT(out, StrEq("2000\nstdout\n"));
-    EXPECT_THAT(err, StrEq("stderr\n"));
+    EXPECT_THAT(err, StrEq("drop_root_user(): already running as Shell\nstderr\n"));
 }
 
 TEST_F(DumpstateTest, RunCommandAsRootUserBuild) {

cmds/dumpstate/utils.cpp

diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index b7645b4..fc1f721 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -937,7 +937,7 @@
 
 bool drop_root_user() {
     if (getgid() == AID_SHELL && getuid() == AID_SHELL) {
-        MYLOGD("drop_root_user(): already running as Shell");
+        MYLOGD("drop_root_user(): already running as Shell\n");
         return true;
     }
     /* ensure we will keep capabilities when we drop root */