Merge QP1A.190306.002

Change-Id: I93403833e5723da878449a076860bd26858cb62a

1 files changed, 10 insertions, 1 deletions

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 4669b5b4c..495cd59fe 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1126,13 +1126,21 @@ static Result<Success> do_parse_apex_configs(const BuiltinArguments& args) {
 }
 
 static Result<Success> do_setup_runtime_bionic(const BuiltinArguments& args) {
-    if (SwitchToDefaultMountNamespace()) {
+    if (SetupRuntimeBionic()) {
         return Success();
     } else {
         return Error() << "Failed to setup runtime bionic";
     }
 }
 
+static Result<Success> do_enter_default_mount_ns(const BuiltinArguments& args) {
+    if (SwitchToDefaultMountNamespace()) {
+        return Success();
+    } else {
+        return Error() << "Failed to enter into default mount namespace";
+    }
+}
+
 // Builtin-function-map start
 const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
     constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max();
@@ -1184,6 +1192,7 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
         {"start",                   {1,     1,    {false,  do_start}}},
         {"stop",                    {1,     1,    {false,  do_stop}}},
         {"swapon_all",              {1,     1,    {false,  do_swapon_all}}},
+        {"enter_default_mount_ns",  {0,     0,    {false,  do_enter_default_mount_ns}}},
         {"symlink",                 {2,     2,    {true,   do_symlink}}},
         {"sysclktz",                {1,     1,    {false,  do_sysclktz}}},
         {"trigger",                 {1,     1,    {false,  do_trigger}}},