Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename dex2oat datum IDs" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-27 15:22:45 +00:00
committed by Android (Google) Code Review
parent ee4d86d0c1 02607ad140
commit 8720c77d78
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java
View File

@@ -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_APK_FALLBACK;
import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILE_FILTER__ART_COMPILATION_FILTER_FAKE_RUN_FROM_VDEX_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.Slog;
import android.util.jar.StrictJarFile;
import com.android.internal.art.ArtStatsLog; import com.android.internal.art.ArtStatsLog;
import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerService;
@@ -163,7 +163,7 @@ public class ArtStatsLogUtils {
uid, uid,
compilationReason, compilationReason,
compilerFilter, 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), getDexBytes(apkPath),
dexMetadataType, dexMetadataType,
apkType, apkType,
@@ -173,7 +173,7 @@ public class ArtStatsLogUtils {
uid, uid,
compilationReason, compilationReason,
compilerFilter, compilerFilter,
ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_TOTAL_TIME, ArtStatsLog.ART_DATUM_REPORTED__KIND__ART_DATUM_DEX2OAT_TOTAL_TIME_COUNTER_MILLIS,
compileTime, compileTime,
dexMetadataType, dexMetadataType,
apkType, apkType,

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

@@ -28,8 +28,8 @@ import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.mockito.Mock;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import java.io.IOException; import java.io.IOException;
@@ -277,7 +277,7 @@ public final class ArtStatsLogUtilsTest {
UID, UID,
COMPILATION_REASON, COMPILATION_REASON,
COMPILER_FILTER, 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, DEX_CONTENT.length,
dexMetadataType, dexMetadataType,
ArtStatsLog.ART_DATUM_REPORTED__APK_TYPE__ART_APK_TYPE_BASE, ArtStatsLog.ART_DATUM_REPORTED__APK_TYPE__ART_APK_TYPE_BASE,
@@ -287,7 +287,7 @@ public final class ArtStatsLogUtilsTest {
UID, UID,
COMPILATION_REASON, COMPILATION_REASON,
COMPILER_FILTER, 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, COMPILE_TIME,
dexMetadataType, dexMetadataType,
ArtStatsLog.ART_DATUM_REPORTED__APK_TYPE__ART_APK_TYPE_BASE, ArtStatsLog.ART_DATUM_REPORTED__APK_TYPE__ART_APK_TYPE_BASE,