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

Commit 50b1e71d authored by Stefano Cianciulli's avatar Stefano Cianciulli Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id20d9ceddfe278e10219d54247811d6ff60d6862
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7076608 bffcfd4c

services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }