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

Commit 955cfa7c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not enable storage app data isolation on special mount options app"... 

Merge "Do not enable storage app data isolation on special mount options app" into rvc-dev am: e96d92cd am: 5a036924

Change-Id: Id5cb564672cb3e27cb9cbf71955bc431c377e556
parents 1014a496 5a036924

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

+12 −2
Original line number Diff line number Diff line
@@ -2181,6 +2181,17 @@ public final class ProcessList { 
        return result;

    }



    private boolean needsStorageDataIsolation(StorageManagerInternal storageManagerInternal,

            ProcessRecord app) {

        return mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid)

                && !storageManagerInternal.isExternalStorageService(app.uid)

                // Special mounting mode doesn't need to have data isolation as they won't

                // access /mnt/user anyway.

                && app.mountMode != Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE

                && app.mountMode != Zygote.MOUNT_EXTERNAL_PASS_THROUGH

                && app.mountMode != Zygote.MOUNT_EXTERNAL_INSTALLER;

    }



    private Process.ProcessStartResult startProcess(HostingRecord hostingRecord, String entryPoint,

            ProcessRecord app, int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags,

            int mountExternal, String seInfo, String requiredAbi, String instructionSet,
@@ -2237,8 +2248,7 @@ public final class ProcessList { 
            int userId = UserHandle.getUserId(uid);

            StorageManagerInternal storageManagerInternal = LocalServices.getService(

                    StorageManagerInternal.class);

            if (mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid)

                    && !storageManagerInternal.isExternalStorageService(uid)) {

            if (needsStorageDataIsolation(storageManagerInternal, app)) {

                bindMountAppStorageDirs = true;

                if (pkgDataInfoMap == null ||

                        !storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(),