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

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

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

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

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

Change-Id: I25cebb68471d4f2e3e2a17f1baaf843aea56b782
parents 5208561d cd47d47f

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

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

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Original line 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,

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

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

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

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

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