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

Merge "Rename enum in ArtDexMetadataType with appropriate prefix." am: 59437812ad

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

Change-Id: Icdd6a1986fbe418532aedc1c99be7964bab95098
This commit is contained in:
Yan Wang
2021-03-16 18:13:30 +00:00
committed by Automerger Merge Worker
parent c86d34a950 59437812ad
commit 637ebffc04
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ public class ArtStatsLogUtils {
private static int getDexMetadataType(String dexMetadataPath) { private static int getDexMetadataType(String dexMetadataPath) {
if (dexMetadataPath == null) { if (dexMetadataPath == null) {
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__NONE_DEX_METADATA; return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_NONE;
} }
StrictJarFile jarFile = null; StrictJarFile jarFile = null;
try { try {
@@ -199,17 +199,21 @@ public class ArtStatsLogUtils {
boolean hasProfile = findFileName(jarFile, PROFILE_DEX_METADATA); boolean hasProfile = findFileName(jarFile, PROFILE_DEX_METADATA);
boolean hasVdex = findFileName(jarFile, VDEX_DEX_METADATA); boolean hasVdex = findFileName(jarFile, VDEX_DEX_METADATA);
if (hasProfile && hasVdex) { if (hasProfile && hasVdex) {
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__PROFILE_AND_VDEX; return ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_PROFILE_AND_VDEX;
} else if (hasProfile) { } else if (hasProfile) {
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__PROFILE; return ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_PROFILE;
} else if (hasVdex) { } else if (hasVdex) {
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__VDEX; return ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_VDEX;
} else { } else {
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__UNKNOWN_DEX_METADATA; return ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_UNKNOWN;
} }
} catch (IOException ignore) { } catch (IOException ignore) {
Slog.e(TAG, "Error when parsing dex metadata " + dexMetadataPath); Slog.e(TAG, "Error when parsing dex metadata " + dexMetadataPath);
return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__ERROR_DEX_METADATA; return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_ERROR;
} finally { } finally {
try { try {
if (jarFile != null) { if (jarFile != null) {

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

@@ -106,7 +106,8 @@ public final class ArtStatsLogUtilsTest {
RESULT_CODE); RESULT_CODE);
// Assert // Assert
verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__PROFILE_AND_VDEX); verifyWrites(ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_PROFILE_AND_VDEX);
} finally { } finally {
deleteSliently(dexMetadataPath); deleteSliently(dexMetadataPath);
deleteSliently(apk); deleteSliently(apk);
@@ -135,7 +136,8 @@ public final class ArtStatsLogUtilsTest {
RESULT_CODE); RESULT_CODE);
// Assert // Assert
verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__PROFILE); verifyWrites(ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_PROFILE);
} finally { } finally {
deleteSliently(dexMetadataPath); deleteSliently(dexMetadataPath);
deleteSliently(apk); deleteSliently(apk);
@@ -164,7 +166,8 @@ public final class ArtStatsLogUtilsTest {
RESULT_CODE); RESULT_CODE);
// Assert // Assert
verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__VDEX); verifyWrites(ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_VDEX);
} finally { } finally {
deleteSliently(dexMetadataPath); deleteSliently(dexMetadataPath);
deleteSliently(apk); deleteSliently(apk);
@@ -191,7 +194,8 @@ public final class ArtStatsLogUtilsTest {
RESULT_CODE); RESULT_CODE);
// Assert // Assert
verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__NONE_DEX_METADATA); verifyWrites(ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_NONE);
} finally { } finally {
deleteSliently(apk); deleteSliently(apk);
} }
@@ -219,7 +223,8 @@ public final class ArtStatsLogUtilsTest {
RESULT_CODE); RESULT_CODE);
// Assert // Assert
verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__UNKNOWN_DEX_METADATA); verifyWrites(ArtStatsLog.
ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_UNKNOWN);
} finally { } finally {
deleteSliently(dexMetadataPath); deleteSliently(dexMetadataPath);
deleteSliently(apk); deleteSliently(apk);