diff options
| author | Ricky Wai <rickywai@google.com> | 2020-04-08 16:14:37 +0100 |
|---|---|---|
| committer | Ricky Wai <rickywai@google.com> | 2020-04-09 13:33:52 +0000 |
| commit | 64167478309bf6189f1e211eeea4cf6e8fc45dce (patch) | |
| tree | 7f737c10b9e485ce21187a1d91eb7d64e535d0cc /core | |
| parent | afef06a0f6c985418725c4b997dea81a572e567f (diff) | |
Check if fuse enabled before mounting storage data and obb dirs
Also, do not bind mount storage obb and data dirs if mount external is
in pass_through mode.
Fix: 151219235
Fix: 152395018
Fix: 152490627
Test: atest AdoptableHostTest
Change-Id: I77a86be5582ded0915b0a8a49d2b2a8c17fe58b7
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/com_android_internal_os_Zygote.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 4b30359e671a..924dc4b3a051 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -1653,7 +1653,9 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, uid, process_name, managed_nice_name, fail_fn); isolateJitProfile(env, pkg_data_info_list, uid, process_name, managed_nice_name, fail_fn); } - if ((mount_external != MOUNT_EXTERNAL_INSTALLER) && mount_storage_dirs) { + if (mount_external != MOUNT_EXTERNAL_INSTALLER && + mount_external != MOUNT_EXTERNAL_PASS_THROUGH && + mount_storage_dirs) { BindMountStorageDirs(env, pkg_data_info_list, uid, process_name, managed_nice_name, fail_fn); } |