commit 26c4157a0823688ba78bf29d93fbce0def3a0fa6
author Felipe Leme <felipeal@google.com> Thu Oct 06 14:34:43 2016 -0700
committer Felipe Leme <felipeal@google.com> Thu Oct 06 14:38:08 2016 -0700
tree b55a77ff0b5b644697e219bb2fffb0e421ea457c
parent d80e6b6109c52d57ebba675c1f97fcb2ca1d93c5

Fixed RunCommandDropRoot when running as Shell.

BUG: 26379932
BUG: 31807540

Test: mmm -j32 frameworks/native/cmds/dumpstate/ && adb push ${ANDROID_PRODUCT_OUT}/data/nativetest/dumpstate_test* /data/nativetest&& adb unroot && adb shell /data/nativetest/dumpstate_test/dumpstate_test

Change-Id: Id582f5fbd4d6282a2eacce602ae1a6d1f62d5c61

cmds/dumpstate/tests/dumpstate_test.cpp

diff --git a/cmds/dumpstate/tests/dumpstate_test.cpp b/cmds/dumpstate/tests/dumpstate_test.cpp
index d2d5b40..60ac6d1 100644
--- a/cmds/dumpstate/tests/dumpstate_test.cpp
+++ b/cmds/dumpstate/tests/dumpstate_test.cpp
@@ -306,7 +306,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 a9118b1..36006af 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -925,7 +925,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 */