Merge "Revert "remove app-ephemeral""
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 39f4d42..7cdb3ce 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -311,6 +311,11 @@
}
/** {@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 cb32eb7..efd3132 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -787,6 +787,9 @@
}
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 15920a7..0d63f72 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -626,6 +626,7 @@
/** 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 @@
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 @@
| 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