Merge changes from topics "add-gc-type-in-art-metrics", "report-uffd-minor-fault" am: bffcfd4cf8

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

Change-Id: Id20d9ceddfe278e10219d54247811d6ff60d6862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Stefano Cianciulli
2023-01-09 18:26:08 +00:00
committed by Automerger Merge Worker

View File

@@ -299,7 +299,8 @@ public class ArtStatsLogUtils {
apkType, apkType,
ISA_MAP.getOrDefault(isa, ISA_MAP.getOrDefault(isa,
ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_UNKNOWN), ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_UNKNOWN),
ArtStatsLog.ART_DATUM_REPORTED__GC__ART_GC_COLLECTOR_TYPE_UNKNOWN); ArtStatsLog.ART_DATUM_REPORTED__GC__ART_GC_COLLECTOR_TYPE_UNKNOWN,
ArtStatsLog.ART_DATUM_REPORTED__UFFD_SUPPORT__ART_UFFD_SUPPORT_UNKNOWN);
} }
} }