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

Commit 22a05e81 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a mapping for compilation reason "cloud" for app startup metrics."... 

Merge "Add a mapping for compilation reason "cloud" for app startup metrics." into main am: 9ad32764 am: 6c4eef38

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



Change-Id: I1f7c6b7232b34b15076b648037a89478d2f20be2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd413e96 6c4eef38

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

+3 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { 
    private static final int TRON_COMPILATION_REASON_PREBUILT = 23;

    private static final int TRON_COMPILATION_REASON_VDEX = 24;

    private static final int TRON_COMPILATION_REASON_BOOT_AFTER_MAINLINE_UPDATE = 25;

    private static final int TRON_COMPILATION_REASON_CLOUD = 26;



    // The annotation to add as a suffix to the compilation reason when dexopt was

    // performed with dex metadata.
@@ -460,6 +461,8 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { 
                return TRON_COMPILATION_REASON_INSTALL_BULK_DOWNGRADED;

            case "install-bulk-secondary-downgraded" :

                return TRON_COMPILATION_REASON_INSTALL_BULK_SECONDARY_DOWNGRADED;

            case "cloud":

                return TRON_COMPILATION_REASON_CLOUD;

            // These are special markers for dex metadata installation that do not

            // have an equivalent as a system property.

            case "install" + DEXOPT_REASON_WITH_DEX_METADATA_ANNOTATION :