From a3860c971223cac69edbe0ee52098ab5ce8ebf67 Mon Sep 17 00:00:00 2001 From: Stefano Cianciulli Date: Wed, 30 Nov 2022 10:49:02 +0000 Subject: [PATCH 1/2] Change ArtStatsLog.write() to report unknown GC type Bug: 249772734 Test: atest ArtGtestsTargetChroot Change-Id: I57bc9ae805c89df3b3713292742e6b3505f19d8e (cherry picked from commit I5f0620fdcd9074f6f4896372dfb808c92affe425) Merged-In: I57bc9ae805c89df3b3713292742e6b3505f19d8e --- .../core/java/com/android/server/pm/dex/ArtStatsLogUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 14075301d523f..f7d1b92760af7 100644 --- a/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java +++ b/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java @@ -298,7 +298,8 @@ public class ArtStatsLogUtils { dexMetadataType, apkType, 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); } } From 74a3cb14bd7b03e12c35b5eafc321f0e88c64cb4 Mon Sep 17 00:00:00 2001 From: Stefano Cianciulli Date: Wed, 7 Dec 2022 16:39:15 +0000 Subject: [PATCH 2/2] Change ArtStatsLog.write() to report unknown uffd/minor fault support Bug: 249772734 Test: atest ArtGtestsTargetChroot Change-Id: I675a90adbc514c92d0ca56936917d5063d7a0215 (cherry picked from commit I8e95ebeaeccefcf95dc18fa0934927b0069a6f3f) Merged-In: I675a90adbc514c92d0ca56936917d5063d7a0215 --- .../core/java/com/android/server/pm/dex/ArtStatsLogUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f7d1b92760af7..e0561519c23b1 100644 --- a/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java +++ b/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java @@ -299,7 +299,8 @@ public class ArtStatsLogUtils { apkType, ISA_MAP.getOrDefault(isa, 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); } }