commit 67efd103af857a77fa223b4c66b3a12a6693af16
author Josh Gao <jmgao@google.com> Thu Mar 29 20:52:34 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 29 20:52:34 2018 +0000
tree 890c5b2898bdfd82f8b8727e6ada02a0baef438f
parent df8ccaeedeb3437355102283335b6d7c643c2337
parent 038741229606e9c0983f77d3af79ed5044343495

Merge "adbd: spawn login shell when run without a command." am: 31ed2a5c04
am: a7a66f40fd

Change-Id: I7389663e6408154dfc4ca0c81349fe6dc9cefd0e

adb/daemon/shell_service.cpp

diff --git a/adb/daemon/shell_service.cpp b/adb/daemon/shell_service.cpp
index da1222b..401c99c 100644
--- a/adb/daemon/shell_service.cpp
+++ b/adb/daemon/shell_service.cpp
@@ -344,7 +344,8 @@
         }
 
         if (command_.empty()) {
-            execle(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr, cenv.data());
+            // Spawn a login shell if we don't have a command.
+            execle(_PATH_BSHELL, "-" _PATH_BSHELL, nullptr, cenv.data());
         } else {
             execle(_PATH_BSHELL, _PATH_BSHELL, "-c", command_.c_str(), nullptr, cenv.data());
         }