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

Commit e7a9b56e authored by Ricky Wai's avatar Ricky Wai Committed by Automerger Merge Worker
Browse files

Merge "Change mounting storage data and obb to on by default" into sc-dev am: 4f1ad7e4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13469849

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c653f0841e781bb1792d7f5b46d714409e36ef2
parents d9b0325e 4f1ad7e4

cmds/sm/src/com/android/commands/sm/Sm.java

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ public final class Sm { 


    public void runDisableAppDataIsolation() throws RemoteException {

        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.");

        }

        final String pkgName = nextArg();

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,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);

services/core/java/com/android/server/StorageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1791,7 +1791,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());

services/core/java/com/android/server/am/ProcessList.java

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,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);

        mAppDataIsolationAllowlistedApps = new ArrayList<>(

                SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());