Merge "Revert "Revert "remove app-ephemeral""" (19657b35) · Commits · e / os / android_frameworks_base

core/java/android/os/Environment.java

+0 −5

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

	/** {@hide} */
	public static File getDataAppEphemeralDirectory(String volumeUuid) {
	return new File(getDataDirectory(volumeUuid), "app-ephemeral");
	}

	/** {@hide} */		/** {@hide} */
	public static File getDataUserCeDirectory(String volumeUuid) {		public static File getDataUserCeDirectory(String volumeUuid) {
	return new File(getDataDirectory(volumeUuid), "user");		return new File(getDataDirectory(volumeUuid), "user");

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

+0 −3

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

	private File buildStagingDir(String volumeUuid, boolean isEphemeral) {		private File buildStagingDir(String volumeUuid, boolean isEphemeral) {
	if (isEphemeral) {
	return Environment.getDataAppEphemeralDirectory(volumeUuid);
	}
	return Environment.getDataAppDirectory(volumeUuid);		return Environment.getDataAppDirectory(volumeUuid);
	}		}

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

+0 −6

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

	/** Directory where installed third-party apps stored */		/** Directory where installed third-party apps stored */
	final File mAppInstallDir;		final File mAppInstallDir;
	final File mEphemeralInstallDir;

	/**		/**
	* Directory to which applications installed internally have their		* Directory to which applications installed internally have their
	@@ -2288,7 +2287,6 @@ public class PackageManagerService extends IPackageManager.Stub {
	File dataDir = Environment.getDataDirectory();		File dataDir = Environment.getDataDirectory();
	mAppInstallDir = new File(dataDir, "app");		mAppInstallDir = new File(dataDir, "app");
	mAppLib32InstallDir = new File(dataDir, "app-lib");		mAppLib32InstallDir = new File(dataDir, "app-lib");
	mEphemeralInstallDir = new File(dataDir, "app-ephemeral");
	mAsecInternalPath = new File(dataDir, "app-asec").getPath();		mAsecInternalPath = new File(dataDir, "app-asec").getPath();
	mDrmAppPrivateInstallDir = new File(dataDir, "app-private");		mDrmAppPrivateInstallDir = new File(dataDir, "app-private");
	sUserManager = new UserManagerService(context, this,		sUserManager = new UserManagerService(context, this,
	@@ -2592,10 +2590,6 @@ public class PackageManagerService extends IPackageManager.Stub {
	\| PackageParser.PARSE_FORWARD_LOCK,		\| PackageParser.PARSE_FORWARD_LOCK,
	scanFlags \| SCAN_REQUIRE_KNOWN, 0);		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		* Remove disable package settings for any updated system
	* apps that were removed via an OTA. If they're not a		* apps that were removed via an OTA. If they're not a