commit | 06af1c0ede225d269e0e2753cdb7a709120b9358 | [log] [tgz] |
---|---|---|
author | Robert Sesek <rsesek@google.com> | Thu Nov 10 21:50:04 2016 -0500 |
committer | Robert Sesek <rsesek@google.com> | Thu Nov 10 21:50:04 2016 -0500 |
tree | a6e37c6f34c085113a8a93456e1c0f1c24ddea7f | |
parent | c0aacbe513905123cd8424c3319440fba0ed58c8 [diff] [blame] |
Respect force_mount_namespace in MountEmulatedStorage(). In Ieb75cc3009ed26b7366213409d5fad836f597084, the unshare step was skipped if no storage is required. But the change failed to take the force parameter into account Test: m Test: angler boots Test: fugu boots Bug: 21643067 Change-Id: I52447f02fd25f553628564733fd6bf2523c07f7c
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 3e111c0..ca09708 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -304,7 +304,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; }