diff options
author | Brian Carlstrom <bdc@google.com> | 2014-08-28 23:45:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-28 23:45:10 +0000 |
commit | 6d3c8255ff41e5967f45d9fa0b0c677bbf3c34b5 (patch) | |
tree | b31319a71feab255eebaa1184f9ca6440e15646b | |
parent | 7d86375b1e02bff726911ed20070bc8e0553daaa (diff) | |
parent | 09107db4916913912e61bfe592643b9c4c50b500 (diff) | |
download | base-6d3c8255ff41e5967f45d9fa0b0c677bbf3c34b5.tar.gz |
Merge "Remove obsolete pruneDexCache"
-rw-r--r-- | services/java/com/android/server/pm/Installer.java | 4 | ||||
-rwxr-xr-x | services/java/com/android/server/pm/PackageManagerService.java | 23 |
2 files changed, 0 insertions, 27 deletions
diff --git a/services/java/com/android/server/pm/Installer.java b/services/java/com/android/server/pm/Installer.java index 4fd9277b155a..45c3dc94107b 100644 --- a/services/java/com/android/server/pm/Installer.java +++ b/services/java/com/android/server/pm/Installer.java @@ -373,10 +373,6 @@ public final class Installer { } } - public int pruneDexCache(String cacheSubDir) { - return execute("prunedexcache " + cacheSubDir); - } - public int freeCache(long freeStorageSize) { StringBuilder builder = new StringBuilder("freecache"); builder.append(' '); diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 4cbf8456ff65..c6f6b89fa916 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -1447,29 +1447,6 @@ public class PackageManagerService extends IPackageManager.Stub { } } - if (didDexOptLibraryOrTool) { - // If we dexopted a library or tool, 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. - // - // 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 - // class path files in all cases. It is very possible in a - // small maintenance release update that the library and tool - // jars may be unchanged but APK could be removed resulting in - // unused dalvik-cache files. - for (String dexCodeInstructionSet : dexCodeInstructionSets) { - mInstaller.pruneDexCache(dexCodeInstructionSet); - } - - // 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. // (Do this before scanning any apps.) // For security and version matching reason, only consider |