commit 057e9c16e7994c4ab4a2f584d93ebb3e0cea9059
author Robert Sesek <rsesek@google.com> Fri Nov 11 23:55:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 11 23:55:18 2016 +0000
tree 4caedd46c8157764b79e1b0be74b69e41c91f6ae
parent 56853771aeac19af3b085054d51373fad69acacb
parent a0d2e6f4b7c9f3375d89b11532cb8e6e09b5c13b

Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c
am: a0d2e6f4b7

Change-Id: I4044e01b9de9bc502eda18fc34182629ca524701

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index c2f583e..d081549 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -307,7 +307,7 @@
         storageSource = "/mnt/runtime/read";
     } else if (mount_mode == MOUNT_EXTERNAL_WRITE) {
         storageSource = "/mnt/runtime/write";
-    } else {
+    } else if (!force_mount_namespace) {
         // Sane default of no storage visible
         return true;
     }