diff options
| author | 2021-05-27 15:22:45 +0000 | |
|---|---|---|
| committer | 2021-05-27 15:22:45 +0000 | |
| commit | 8720c77d788a573ae57350cdafcfd5249d77a840 (patch) | |
| tree | ee2a84a1cc30a3cfe6b1065c934d22e4b5370f2e | |
| parent | ee4d86d0c1f04fdb676ae67d508ca92b167c30b9 (diff) | |
| parent | 02607ad14064369f249a0d36494450d1036ec77d (diff) | |
Merge "Rename dex2oat datum IDs" into sc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java | 6 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/dex/ArtStatsLogUtilsTest.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java b/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java index 946f8d52ae43..83d4ce7ff057 100644 --- a/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java +++ b/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java @@ -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, diff --git a/services/tests/servicestests/src/com/android/server/pm/dex/ArtStatsLogUtilsTest.java b/services/tests/servicestests/src/com/android/server/pm/dex/ArtStatsLogUtilsTest.java index ef5f00bf8a3c..fdb6e9f5f4ce 100644 --- a/services/tests/servicestests/src/com/android/server/pm/dex/ArtStatsLogUtilsTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/dex/ArtStatsLogUtilsTest.java @@ -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, |