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

Commit 2ff321e6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d7c30866 b6c23ac8

core/jni/com_android_internal_os_Zygote.cpp

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

        mAppDataIsolationWhitelistedApps = new ArrayList<>(

        mAppDataIsolationWhitelistedApps = new ArrayList<>(

                SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());

                SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());