Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "remove app-ephemeral"

Browse Source
This commit is contained in:
Todd Kennedy
2017-02-15 19:48:18 +00:00
committed by Android (Google) Code Review
parent bf92b812db 4eb7cea562
commit 93a8e2c7d1
3 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/Environment.java
View File

@@ -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");

3
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -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);
}

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -630,7 +630,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
@@ -2291,7 +2290,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,
@@ -2595,10 +2593,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