Remove defunct secure FS work
Bug: 3365047
Change-Id: I68eaea295881f5431907e1b93bdd73e644e84aa5
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 9ee71e8..e54e215 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -216,10 +216,6 @@
// This is where all application persistent data goes.
final File mAppDataDir;
- // If Encrypted File System feature is enabled, all application persistent data
- // should go here instead.
- final File mSecureAppDataDir;
-
// This is the object monitoring the framework dir.
final FileObserver mFrameworkInstallObserver;
@@ -785,7 +781,6 @@
File dataDir = Environment.getDataDirectory();
mAppDataDir = new File(dataDir, "data");
- mSecureAppDataDir = new File(dataDir, "secure/data");
mDrmAppPrivateInstallDir = new File(dataDir, "app-private");
if (mInstaller == null) {
@@ -795,7 +790,6 @@
File miscDir = new File(dataDir, "misc");
miscDir.mkdirs();
mAppDataDir.mkdirs();
- mSecureAppDataDir.mkdirs();
mDrmAppPrivateInstallDir.mkdirs();
}
@@ -964,9 +958,7 @@
+ " no longer exists; wiping its data";
reportSettingsProblem(Log.WARN, msg);
if (mInstaller != null) {
- // XXX how to set useEncryptedFSDir for packages that
- // are not encrypted?
- mInstaller.remove(ps.name, true);
+ mInstaller.remove(ps.name);
}
}
}
@@ -1050,8 +1042,7 @@
void cleanupInstallFailedPackage(PackageSetting ps) {
Slog.i(TAG, "Cleaning up incompletely installed app: " + ps.name);
if (mInstaller != null) {
- boolean useSecureFS = false;
- int retCode = mInstaller.remove(ps.name, useSecureFS);
+ int retCode = mInstaller.remove(ps.name);
if (retCode < 0) {
Slog.w(TAG, "Couldn't remove app data directory for package: "
+ ps.name + ", retcode=" + retCode);
@@ -2796,13 +2787,7 @@
}
private File getDataPathForPackage(PackageParser.Package pkg) {
- boolean useEncryptedFSDir = false;
- File dataPath;
- if (useEncryptedFSDir) {
- dataPath = new File(mSecureAppDataDir, pkg.packageName);
- } else {
- dataPath = new File(mAppDataDir, pkg.packageName);
- }
+ final File dataPath = new File(mAppDataDir, pkg.packageName);
return dataPath;
}
@@ -3132,7 +3117,6 @@
pkg.applicationInfo.dataDir = dataPath.getPath();
} else {
// This is a normal package, need to make its data directory.
- boolean useEncryptedFSDir = false;
dataPath = getDataPathForPackage(pkg);
boolean uidError = false;
@@ -3149,7 +3133,7 @@
// If this is a system app, we can at least delete its
// current data so the application will still work.
if (mInstaller != null) {
- int ret = mInstaller.remove(pkgName, useEncryptedFSDir);
+ int ret = mInstaller.remove(pkgName);
if (ret >= 0) {
// Old data gone!
String msg = "System package " + pkg.packageName
@@ -3160,7 +3144,7 @@
recovered = true;
// And now re-install the app.
- ret = mInstaller.install(pkgName, useEncryptedFSDir, pkg.applicationInfo.uid,
+ ret = mInstaller.install(pkgName, pkg.applicationInfo.uid,
pkg.applicationInfo.uid);
if (ret == -1) {
// Ack should not happen!
@@ -3201,7 +3185,7 @@
Log.v(TAG, "Want this data dir: " + dataPath);
//invoke installer to do the actual installation
if (mInstaller != null) {
- int ret = mInstaller.install(pkgName, useEncryptedFSDir, pkg.applicationInfo.uid,
+ int ret = mInstaller.install(pkgName, pkg.applicationInfo.uid,
pkg.applicationInfo.uid);
if(ret < 0) {
// Error from installer
@@ -6293,9 +6277,8 @@
deletedPs = mSettings.mPackages.get(packageName);
}
if ((flags&PackageManager.DONT_DELETE_DATA) == 0) {
- boolean useEncryptedFSDir = false;
if (mInstaller != null) {
- int retCode = mInstaller.remove(packageName, useEncryptedFSDir);
+ int retCode = mInstaller.remove(packageName);
if (retCode < 0) {
Slog.w(TAG, "Couldn't remove app data or cache directory for package: "
+ packageName + ", retcode=" + retCode);
@@ -6535,7 +6518,6 @@
p = ps.pkg;
}
}
- boolean useEncryptedFSDir = false;
if (!dataOnly) {
//need to check this only for fully installed applications
@@ -6550,7 +6532,7 @@
}
}
if (mInstaller != null) {
- int retCode = mInstaller.clearUserData(packageName, useEncryptedFSDir);
+ int retCode = mInstaller.clearUserData(packageName);
if (retCode < 0) {
Slog.w(TAG, "Couldn't remove cache files for package: "
+ packageName);
@@ -6601,9 +6583,8 @@
Slog.w(TAG, "Package " + packageName + " has no applicationInfo.");
return false;
}
- boolean useEncryptedFSDir = false;
if (mInstaller != null) {
- int retCode = mInstaller.deleteCacheFiles(packageName, useEncryptedFSDir);
+ int retCode = mInstaller.deleteCacheFiles(packageName);
if (retCode < 0) {
Slog.w(TAG, "Couldn't remove cache files for package: "
+ packageName);
@@ -6663,10 +6644,8 @@
}
publicSrcDir = isForwardLocked(p) ? applicationInfo.publicSourceDir : null;
}
- boolean useEncryptedFSDir = false;
if (mInstaller != null) {
- int res = mInstaller.getSizeInfo(packageName, p.mPath,
- publicSrcDir, pStats, useEncryptedFSDir);
+ int res = mInstaller.getSizeInfo(packageName, p.mPath, publicSrcDir, pStats);
if (res < 0) {
return false;
} else {