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

Commit d80ba8ab authored by Guang Zhu's avatar Guang Zhu Committed by Android (Google) Code Review
Browse files

Merge "Revert "remove app-ephemeral""

parents 626ffb45 c2f0d886

core/java/android/os/Environment.java

+5 −0
Original line number Diff line number Diff line
@@ -310,6 +310,11 @@ public class Environment { 
        return new File(getDataDirectory(volumeUuid), "app");

    }



    /** {@hide} */

    public static File getDataAppEphemeralDirectory(String volumeUuid) {

        return new File(getDataDirectory(volumeUuid), "app-ephemeral");

    }



    /** {@hide} */

    public static File getDataUserCeDirectory(String volumeUuid) {

        return new File(getDataDirectory(volumeUuid), "user");

services/core/java/com/android/server/pm/PackageInstallerService.java

+3 −0
Original line number Diff line number Diff line
@@ -787,6 +787,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub { 
    }



    private File buildStagingDir(String volumeUuid, boolean isEphemeral) {

        if (isEphemeral) {

            return Environment.getDataAppEphemeralDirectory(volumeUuid);

        }

        return Environment.getDataAppDirectory(volumeUuid);

    }

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ public class PackageManagerService extends IPackageManager.Stub { 














    /** Directory where installed third-party apps stored */















    final File mAppInstallDir;













    final File mEphemeralInstallDir;





























    /**















     * Directory to which applications installed internally have their










@@ -2284,6 +2285,7 @@ public class PackageManagerService extends IPackageManager.Stub {













            File dataDir = Environment.getDataDirectory();















            mAppInstallDir = new File(dataDir, "app");















            mAppLib32InstallDir = new File(dataDir, "app-lib");













            mEphemeralInstallDir = new File(dataDir, "app-ephemeral");















            mAsecInternalPath = new File(dataDir, "app-asec").getPath();















            mDrmAppPrivateInstallDir = new File(dataDir, "app-private");















            sUserManager = new UserManagerService(context, this,










@@ -2587,6 +2589,10 @@ public class PackageManagerService extends IPackageManager.Stub {













                        | PackageParser.PARSE_FORWARD_LOCK,















                        scanFlags | SCAN_REQUIRE_KNOWN, 0);



























                scanDirLI(mEphemeralInstallDir, mDefParseFlags













                        | PackageParser.PARSE_IS_EPHEMERAL,













                        scanFlags | SCAN_REQUIRE_KNOWN, 0);



























                /**















                 * Remove disable package settings for any updated system















                 * apps that were removed via an OTA. If they're not a