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

am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."

Browse Source 
* commit '22a32d883794a7a96ff5ffb4830ea59065b3ebda':
  Explicitly list out the list of cache subdirs to prune.
This commit is contained in:
Narayan Kamath
2014-06-24 12:19:10 +00:00
committed by Android Git Automerger
parent 816cff12e1 22a32d8837
commit 152d5cd30b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/Installer.java
View File

@@ -27,6 +27,7 @@ import android.util.Slog;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
public final class Installer extends SystemService {
private static final String TAG = "Installer";
@@ -345,8 +346,8 @@ public final class Installer extends SystemService {
}
}
public int pruneDexCache() {
return execute("prunedexcache");
public int pruneDexCache(String cacheSubDir) {
return execute("prunedexcache " + cacheSubDir);
}
public int freeCache(long freeStorageSize) {

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

@@ -1443,9 +1443,6 @@ public class PackageManagerService extends IPackageManager.Stub {
// 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.
//
// TODO: This should be revisited because it isn't as good an indicator
// as it used to be. It used to include the boot classpath but at some point
// DexFile.isDexOptNeeded started returning false for the boot
@@ -1453,7 +1450,15 @@ public class PackageManagerService extends IPackageManager.Stub {
// small maintenance release update that the library and tool
// jars may be unchanged but APK could be removed resulting in
// unused dalvik-cache files.
mInstaller.pruneDexCache();
for (String instructionSet : instructionSets) {
mInstaller.pruneDexCache(instructionSet);
}
// Additionally, delete all dex files from the root directory
// since there shouldn't be any there anyway, unless we're upgrading
// from an older OS version or a build that contained the "old" style
// flat scheme.
mInstaller.pruneDexCache(".");
}
// Collect vendor overlay packages.