From 4eb7cea562cd117e598a327ab4d93142589c1ae6 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Wed, 15 Feb 2017 07:06:02 -0800 Subject: [PATCH] remove app-ephemeral instant apps are no longer stored in a separate folder. they are now stored along side other full apps in the apps directory. Bug: 25119046 Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest Change-Id: I6669be797987169a0b9cca78f80539c908812f9e --- core/java/android/os/Environment.java | 5 ----- .../java/com/android/server/pm/PackageInstallerService.java | 3 --- .../java/com/android/server/pm/PackageManagerService.java | 6 ------ 3 files changed, 14 deletions(-) diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 7cdb3cec5dbba..39f4d428a230a 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -310,11 +310,6 @@ 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"); diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index eb42f809c0e8f..0df4570f87f20 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -787,9 +787,6 @@ public class PackageInstallerService extends IPackageInstaller.Stub { } private File buildStagingDir(String volumeUuid, boolean isEphemeral) { - if (isEphemeral) { - return Environment.getDataAppEphemeralDirectory(volumeUuid); - } return Environment.getDataAppDirectory(volumeUuid); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 01db37c2d601c..814ba2176fd5f 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -629,7 +629,6 @@ 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 @@ -2274,7 +2273,6 @@ 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, @@ -2578,10 +2576,6 @@ 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