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

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

Merge "Revert "Change mounting storage data and obb flag to on by default""... 

Merge "Revert "Change mounting storage data and obb flag to on by default"" into sc-dev am: 1d42095d

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

Change-Id: I558b48ae6f982d430c85ae355f9b8695eb587a33
parents ec7dc253 1d42095d

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, true)) {

                ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false)) {

            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
@@ -826,7 +826,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, true);

  bool isAppDataIsolationEnabled = GetBoolProperty(kVoldAppDataIsolation, false);



  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
@@ -1850,7 +1850,7 @@ class StorageManagerService extends IStorageManager.Stub 
    public StorageManagerService(Context context) {

        sSelf = this;

        mVoldAppDataIsolationEnabled = SystemProperties.getBoolean(

                ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, true);

                ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false);

        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
@@ -802,7 +802,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, true);

                ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false);

        mAppDataIsolationAllowlistedApps = new ArrayList<>(

                SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());