commit 7fb2305d9c16f676fd122c250358113b1e6d8a5c
author Robert Sesek <rsesek@google.com> Sat Apr 01 06:57:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Apr 01 06:57:55 2017 +0000
tree e9e540ca44d28eb41d8994fc7a1dbfd4a0f36319
parent 96e331fb1c199632cb09b221373363766a3aea5e
parent 8bafcfe81c1022fa9e54335cd810cefd8c3dcc55

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am: c04b06dc81
am: 8bafcfe81c

Change-Id: I6e5b9eef6c2a6da1c3185d274afbfdec33d14a7a

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 0ab27f2..b95258b 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -346,6 +346,11 @@
         return false;
     }
 
+    // Handle force_mount_namespace with MOUNT_EXTERNAL_NONE.
+    if (mount_mode == MOUNT_EXTERNAL_NONE) {
+        return true;
+    }
+
     if (TEMP_FAILURE_RETRY(mount(storageSource.string(), "/storage",
             NULL, MS_BIND | MS_REC | MS_SLAVE, NULL)) == -1) {
         ALOGW("Failed to mount %s to /storage: %s", storageSource.string(), strerror(errno));