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

Merge "Perform a non strict matching of .dm files when computing the size"

Browse Source
This commit is contained in:
Calin Juravle
2018-01-23 04:11:04 +00:00
committed by Android (Google) Code Review
parent 6703f8e67d 10b27eb2cc
commit cd99c3a17a
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/dex/DexMetadataHelper.java
View File

@@ -107,8 +107,8 @@ public class DexMetadataHelper {
* For each code path (.apk) the method checks if a matching dex metadata file (.dm) exists.
* If it does it adds the pair to the returned map.
*
* Note that this method will do a strict
* matching based on the extension ('foo.dm' will only match 'foo.apk').
* Note that this method will do a loose
* matching based on the extension ('foo.dm' will match 'foo.apk' or 'foo').
*
* This should only be used for code paths extracted from a package structure after the naming
* was enforced in the installer.
@@ -118,7 +118,7 @@ public class DexMetadataHelper {
ArrayMap<String, String> result = new ArrayMap<>();
for (int i = codePaths.size() - 1; i >= 0; i--) {
String codePath = codePaths.get(i);
String dexMetadataPath = buildDexMetadataPathForApk(codePath);
String dexMetadataPath = buildDexMetadataPathForFile(new File(codePath));
if (Files.exists(Paths.get(dexMetadataPath))) {
result.put(codePath, dexMetadataPath);