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

Merge "Fix dex file pruning logic."

Browse Source
This commit is contained in:
Narayan Kamath
2014-05-01 13:56:34 +00:00
committed by Gerrit Code Review
parent bcc3b312b0 57156572a7
commit 27f2bfc406
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1289,24 +1289,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
if (didDexOpt) {
File dalvikCacheDir = new File(dataDir, "dalvik-cache");
// If we had to do a dexopt of one of the previous
// things, then something on the system has changed.
// Consider this significant, and wipe away all other
// existing dexopt files to ensure we don't leave any
// dangling around.
String[] files = dalvikCacheDir.list();
if (files != null) {
for (int i=0; i<files.length; i++) {
String fn = files[i];
if (fn.startsWith("data@app@")
|| fn.startsWith("data@app-private@")) {
Slog.i(TAG, "Pruning dalvik file: " + fn);
(new File(dalvikCacheDir, fn)).delete();
}
}
}
pruneDexFiles(new File(dataDir, "dalvik-cache"));
}
// Collect vendor overlay packages.
@@ -1528,6 +1511,37 @@ public class PackageManagerService extends IPackageManager.Stub {
} // synchronized (mInstallLock)
}
private static void pruneDexFiles(File cacheDir) {
// If we had to do a dexopt of one of the previous
// things, then something on the system has changed.
// Consider this significant, and wipe away all other
// existing dexopt files to ensure we don't leave any
// dangling around.
//
// Additionally, delete all dex files from the root directory
// since there shouldn't be any there anyway.
File[] files = cacheDir.listFiles();
if (files != null) {
for (File file : files) {
if (!file.isDirectory()) {
Slog.i(TAG, "Pruning dalvik file: " + file.getAbsolutePath());
file.delete();
} else {
File[] subDirList = file.listFiles();
if (subDirList != null) {
for (File subDirFile : subDirList) {
final String fn = subDirFile.getName();
if (fn.startsWith("data@app@") || fn.startsWith("data@app-private@")) {
Slog.i(TAG, "Pruning dalvik file: " + fn);
subDirFile.delete();
}
}
}
}
}
}
}
public boolean isFirstBoot() {
return !mRestoredSettings;
}