Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fb2305d authored by Robert Sesek's avatar Robert Sesek Committed by android-build-merger
Browse files

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

am: 8bafcfe8

Change-Id: I6e5b9eef6c2a6da1c3185d274afbfdec33d14a7a
parents 96e331fb 8bafcfe8

core/jni/com_android_internal_os_Zygote.cpp

+5 −0
Original line number Diff line number Diff line
@@ -346,6 +346,11 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode, 
        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));