Merge "Remove the reading of APK file." (08d53807) · Commits · e / os / android_frameworks_base

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

+0 −36

Original line number	Diff line number	Diff line
		@@ -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;

+0 −8

Original line number	Diff line number	Diff line
		@@ -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,