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

Commit 02607ad1 authored by Eric Holk's avatar Eric Holk
Browse files

Rename dex2oat datum IDs 

The new names make it clearer which ones are counters or histograms,
and what the units are for each one.

See also: https://r.android.com/1715490

Bug: 170149255
Test: m
Change-Id: I0917dbdeafe0b4496ca7df04bd9801d1b19e3dcb
parent a376aeb6

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

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILATI 
import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILE_FILTER__ART_COMPILATION_FILTER_FAKE_RUN_FROM_APK_FALLBACK;

import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILE_FILTER__ART_COMPILATION_FILTER_FAKE_RUN_FROM_VDEX_FALLBACK;



import android.util.jar.StrictJarFile;

import android.util.Slog;

import android.util.jar.StrictJarFile;



import com.android.internal.art.ArtStatsLog;

import com.android.server.pm.PackageManagerService;
@@ -163,7 +163,7 @@ public class ArtStatsLogUtils { 
                uid,

                compilationReason,

                compilerFilter,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_BYTES,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_COUNTER_BYTES,

                getDexBytes(apkPath),

                dexMetadataType,

                apkType,
@@ -173,7 +173,7 @@ public class ArtStatsLogUtils { 
                uid,

                compilationReason,

                compilerFilter,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_TOTAL_TIME,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_TOTAL_TIME_COUNTER_MILLIS,

                compileTime,

                dexMetadataType,

                apkType,

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

+3 −3
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import org.junit.BeforeClass; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;

import org.mockito.Mock;

import org.mockito.InOrder;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.io.IOException;
@@ -277,7 +277,7 @@ public final class ArtStatsLogUtilsTest { 
                UID,

                COMPILATION_REASON,

                COMPILER_FILTER,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_BYTES,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_DEX_CODE_COUNTER_BYTES,

                DEX_CONTENT.length,

                dexMetadataType,

                ArtStatsLog.ART_DATUM_REPORTED__APK_TYPE__ART_APK_TYPE_BASE,
@@ -287,7 +287,7 @@ public final class ArtStatsLogUtilsTest { 
                UID,

                COMPILATION_REASON,

                COMPILER_FILTER,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_TOTAL_TIME,

                ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_TOTAL_TIME_COUNTER_MILLIS,

                COMPILE_TIME,

                dexMetadataType,

                ArtStatsLog.ART_DATUM_REPORTED__APK_TYPE__ART_APK_TYPE_BASE,