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

Commit 4f17d64f authored by Yan Wang's avatar Yan Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie918cc22711f4ccc03e0619868f303e4be0d25d1
parents 3df03a83 08d53807

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

+0 −36
Original line number Original line Diff line number Diff line
@@ -141,14 +141,6 @@ public class ArtStatsLogUtils { 
                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_RESULT_CODE,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_RESULT_CODE,

                result,

                result,

                dexMetadataType);

                dexMetadataType);

        logger.write(

                sessionId,

                uid,

                compilationReason,

                compilerFilter,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_BYTES,

                getDexBytes(path),

                dexMetadataType);

        logger.write(

        logger.write(

                sessionId,

                sessionId,

                uid,

                uid,
@@ -159,34 +151,6 @@ public class ArtStatsLogUtils { 
                dexMetadataType);

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

    private static int getDexMetadataType(String dexMetadataPath) {

        if (dexMetadataPath == null) {

        if (dexMetadataPath == null) {

            return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_NONE;

            return ArtStatsLog.ART_DATUM_REPORTED__DEX_METADATA_TYPE__ART_DEX_METADATA_TYPE_NONE;

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

+0 −8
Original line number Original line Diff line number Diff line
@@ -240,14 +240,6 @@ public final class ArtStatsLogUtilsTest { 
                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_RESULT_CODE,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_RESULT_CODE,

                RESULT_CODE,

                RESULT_CODE,

                dexMetadataType);

                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(

        inorder.verify(mockLogger).write(

                SESSION_ID,

                SESSION_ID,

                UID,

                UID,