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

Merge "Change mounting storage data and obb flag to on by default" into sc-dev

Browse Source
This commit is contained in:
Ricky Wai
2021-04-30 13:49:13 +00:00
committed by Android (Google) Code Review
parent 78a91deb5e b11309b1fc
commit ebffd9b97f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/sm/src/com/android/commands/sm/Sm.java
View File

@@ -258,7 +258,7 @@ public final class Sm {
public void runDisableAppDataIsolation() throws RemoteException { public void runDisableAppDataIsolation() throws RemoteException {
if (!SystemProperties.getBoolean( if (!SystemProperties.getBoolean(
ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false)) { ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, true)) {
throw new IllegalStateException("Storage app data isolation is not enabled."); throw new IllegalStateException("Storage app data isolation is not enabled.");
} }
final String pkgName = nextArg(); final String pkgName = nextArg();

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -825,7 +825,7 @@ static void MountEmulatedStorage(uid_t uid, jint mount_mode,
PrepareDir(user_source, 0710, user_id ? AID_ROOT : AID_SHELL, PrepareDir(user_source, 0710, user_id ? AID_ROOT : AID_SHELL,
multiuser_get_uid(user_id, AID_EVERYBODY), fail_fn); 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) { if (mount_mode == MOUNT_EXTERNAL_PASS_THROUGH) {
const std::string pass_through_source = StringPrintf("/mnt/pass_through/%d", user_id); const std::string pass_through_source = StringPrintf("/mnt/pass_through/%d", user_id);

2
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -1850,7 +1850,7 @@ class StorageManagerService extends IStorageManager.Stub
public StorageManagerService(Context context) { public StorageManagerService(Context context) {
sSelf = this; sSelf = this;
mVoldAppDataIsolationEnabled = SystemProperties.getBoolean( mVoldAppDataIsolationEnabled = SystemProperties.getBoolean(
ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false); ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, true);
mContext = context; mContext = context;
mResolver = mContext.getContentResolver(); mResolver = mContext.getContentResolver();
mCallbacks = new Callbacks(FgThread.get().getLooper()); mCallbacks = new Callbacks(FgThread.get().getLooper());

2
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -792,7 +792,7 @@ public final class ProcessList {
mAppDataIsolationEnabled = mAppDataIsolationEnabled =
SystemProperties.getBoolean(ANDROID_APP_DATA_ISOLATION_ENABLED_PROPERTY, true); SystemProperties.getBoolean(ANDROID_APP_DATA_ISOLATION_ENABLED_PROPERTY, true);
mVoldAppDataIsolationEnabled = SystemProperties.getBoolean( mVoldAppDataIsolationEnabled = SystemProperties.getBoolean(
ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false); ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, true);
mAppDataIsolationAllowlistedApps = new ArrayList<>( mAppDataIsolationAllowlistedApps = new ArrayList<>(
SystemConfig.getInstance().getAppDataIsolationWhitelistedApps()); SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());