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

Commit de6b5582 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename dex2oat datum IDs" into sc-dev am: 8720c77d 

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

Change-Id: Ie31687d789adc5f584849c3e4925bfd5f585fa23
parents ca82712e 8720c77d

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,