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

Commit f45769ef authored by Yan Wang's avatar Yan Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix a ISA map bug. It puts the values to the wrong map." am: cd881a42 

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

Change-Id: I654c5ef665ad9ce24b4ca05f891d74e7af69430e
parents fea2540a cd881a42

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

+6 −12
Original line number Diff line number Diff line
@@ -128,18 +128,12 @@ public class ArtStatsLogUtils { 
    private static final Map<String, Integer> ISA_MAP = new HashMap();



    static {

        COMPILE_FILTER_MAP.put("arm", ArtStatsLog.

                ART_DATUM_REPORTED__ISA__ART_ISA_ARM);

        COMPILE_FILTER_MAP.put("arm64", ArtStatsLog.

                ART_DATUM_REPORTED__ISA__ART_ISA_ARM64);

        COMPILE_FILTER_MAP.put("x86", ArtStatsLog.

                ART_DATUM_REPORTED__ISA__ART_ISA_X86);

        COMPILE_FILTER_MAP.put("x86_64", ArtStatsLog.

                ART_DATUM_REPORTED__ISA__ART_ISA_X86_64);

        COMPILE_FILTER_MAP.put("mips", ArtStatsLog.

                ART_DATUM_REPORTED__ISA__ART_ISA_MIPS);

        COMPILE_FILTER_MAP.put("mips64", ArtStatsLog.

                ART_DATUM_REPORTED__ISA__ART_ISA_MIPS64);

        ISA_MAP.put("arm", ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_ARM);

        ISA_MAP.put("arm64", ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_ARM64);

        ISA_MAP.put("x86", ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_X86);

        ISA_MAP.put("x86_64", ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_X86_64);

        ISA_MAP.put("mips", ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_MIPS);

        ISA_MAP.put("mips64", ArtStatsLog.ART_DATUM_REPORTED__ISA__ART_ISA_MIPS64);

    }



    public static void writeStatsLog(