Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 637ebffc authored by Yan Wang's avatar Yan Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Icdd6a1986fbe418532aedc1c99be7964bab95098
parents c86d34a9 59437812

services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java

+10 −6
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public class ArtStatsLogUtils { 


    private static int getDexMetadataType(String dexMetadataPath) {

        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;

        try {
@@ -199,17 +199,21 @@ public class ArtStatsLogUtils { 
            boolean hasProfile = findFileName(jarFile, PROFILE_DEX_METADATA);

            boolean hasVdex = findFileName(jarFile, VDEX_DEX_METADATA);

            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) {

                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) {

                return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__VDEX;

                return ArtStatsLog.

                    ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_VDEX;

            } 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) {

            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 {

            try {

                if (jarFile != null) {

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

+10 −5
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ public final class ArtStatsLogUtilsTest { 
                    RESULT_CODE);



            // 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 {

            deleteSliently(dexMetadataPath);

            deleteSliently(apk);
@@ -135,7 +136,8 @@ public final class ArtStatsLogUtilsTest { 
                    RESULT_CODE);



            // Assert

            verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__PROFILE);

            verifyWrites(ArtStatsLog.

                ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_PROFILE);

        } finally {

            deleteSliently(dexMetadataPath);

            deleteSliently(apk);
@@ -164,7 +166,8 @@ public final class ArtStatsLogUtilsTest { 
                    RESULT_CODE);



            // Assert

            verifyWrites(ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__VDEX);

            verifyWrites(ArtStatsLog.

                ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_VDEX);

        } finally {

            deleteSliently(dexMetadataPath);

            deleteSliently(apk);
@@ -191,7 +194,8 @@ public final class ArtStatsLogUtilsTest { 
                    RESULT_CODE);



            // 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 {

            deleteSliently(apk);

        }
@@ -219,7 +223,8 @@ public final class ArtStatsLogUtilsTest { 
                    RESULT_CODE);



            // 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 {

            deleteSliently(dexMetadataPath);

            deleteSliently(apk);