Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-01 06:46:31 +00:00
committed by Gerrit Code Review
parent 3946df68ed 06f3930677
commit c04b06dc81
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -346,6 +346,11 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
return false; 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", if (TEMP_FAILURE_RETRY(mount(storageSource.string(), "/storage",
NULL, MS_BIND | MS_REC | MS_SLAVE, NULL)) == -1) { NULL, MS_BIND | MS_REC | MS_SLAVE, NULL)) == -1) {
ALOGW("Failed to mount %s to /storage: %s", storageSource.string(), strerror(errno)); ALOGW("Failed to mount %s to /storage: %s", storageSource.string(), strerror(errno));