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

Merge "Remove the reading of APK file." am: 08d5380762

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: Ie918cc22711f4ccc03e0619868f303e4be0d25d1
This commit is contained in:
Yan Wang
2021-03-19 17:27:58 +00:00
committed by Automerger Merge Worker
parent 3df03a83af 08d5380762
commit 4f17d64ff8
2 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java
View File

@@ -141,14 +141,6 @@ public class ArtStatsLogUtils {
ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_RESULT_CODE,
result,
dexMetadataType);
logger.write(
sessionId,
uid,
compilationReason,
compilerFilter,
ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_BYTES,
getDexBytes(path),
dexMetadataType);
logger.write(
sessionId,
uid,
@@ -159,34 +151,6 @@ public class ArtStatsLogUtils {
dexMetadataType);
}
private static long getDexBytes(String apkPath) {
StrictJarFile jarFile = null;
long dexBytes = 0;
try {
jarFile = new StrictJarFile(apkPath,
/*verify=*/ false,
/*signatureSchemeRollbackProtectionsEnforced=*/ false);
Iterator<ZipEntry> it = jarFile.iterator();
while (it.hasNext()) {
ZipEntry entry = it.next();
if (entry.getName().matches("classes(\\d)*[.]dex")) {
dexBytes += entry.getSize();
}
}
return dexBytes;
} catch (IOException ignore) {
Slog.e(TAG, "Error when parsing APK " + apkPath);
return -1L;
} finally {
try {
if (jarFile != null) {
jarFile.close();
}
} catch (IOException ignore) {
}
}
}
private static int getDexMetadataType(String dexMetadataPath) {
if (dexMetadataPath == null) {
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_NONE;

8
services/tests/servicestests/src/com/android/server/pm/dex/ArtStatsLogUtilsTest.java
View File

@@ -240,14 +240,6 @@ public final class ArtStatsLogUtilsTest {
ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_RESULT_CODE,
RESULT_CODE,
dexMetadataType);
inorder.verify(mockLogger).write(
SESSION_ID,
UID,
COMPILATION_REASON,
COMPILER_FILTER,
ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_BYTES,
DEX_CONTENT.length,
dexMetadataType);
inorder.verify(mockLogger).write(
SESSION_ID,
UID,