From b6c23ac88cf012c5cfaf6c0cc9df65295077d264 Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Tue, 22 Dec 2020 12:05:55 +0000 Subject: [PATCH] Change mounting storage data and obb to on by default Bug: 148049767 Test: atest AdoptableHostTest Test: pass cts/cts_postsubmit_cf_stable-cloud-tf Change-Id: I2d6b690f51d03501c9241201e7e56323d1cdf6a7 --- core/jni/com_android_internal_os_Zygote.cpp | 2 +- .../core/java/com/android/server/StorageManagerService.java | 2 +- services/core/java/com/android/server/am/ProcessList.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 3156f71fa113b..efede21816284 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -843,7 +843,7 @@ static void MountEmulatedStorage(uid_t uid, jint mount_mode, PrepareDir(user_source, 0710, user_id ? AID_ROOT : AID_SHELL, multiuser_get_uid(user_id, AID_EVERYBODY), fail_fn); - bool isAppDataIsolationEnabled = GetBoolProperty(kVoldAppDataIsolation, false); + bool isAppDataIsolationEnabled = GetBoolProperty(kVoldAppDataIsolation, true); if (mount_mode == MOUNT_EXTERNAL_PASS_THROUGH) { const std::string pass_through_source = StringPrintf("/mnt/pass_through/%d", user_id); diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index c951fd438b783..b0f2e24e3be27 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1716,7 +1716,7 @@ class StorageManagerService extends IStorageManager.Stub public StorageManagerService(Context context) { sSelf = this; mVoldAppDataIsolationEnabled = SystemProperties.getBoolean( - ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false); + ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, true); mContext = context; mResolver = mContext.getContentResolver(); mCallbacks = new Callbacks(FgThread.get().getLooper()); diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 6f6cad043a420..53d75d1ddd06a 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -711,7 +711,7 @@ public final class ProcessList { mAppDataIsolationEnabled = SystemProperties.getBoolean(ANDROID_APP_DATA_ISOLATION_ENABLED_PROPERTY, true); mVoldAppDataIsolationEnabled = SystemProperties.getBoolean( - ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false); + ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, true); mAppDataIsolationWhitelistedApps = new ArrayList<>( SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());