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

Commit 13e0d1db authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android (Google) Code Review
Browse files

Merge "Update ArtManagerService for new profilebootclasspath properties"

parents 0013f4b9 88db67cd

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

+5 −1
Original line number Diff line number Diff line
@@ -314,9 +314,13 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { 
            case ArtManager.PROFILE_APPS :

                return SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false);

            case ArtManager.PROFILE_BOOT_IMAGE:

                // The device config property overrides the system property version.

                boolean profileBootClassPath = SystemProperties.getBoolean(

                        "persist.device_config.runtime_native_boot.profilebootclasspath",

                        SystemProperties.getBoolean("dalvik.vm.profilebootclasspath", false));

                return (Build.IS_USERDEBUG || Build.IS_ENG) &&

                        SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false) &&

                        SystemProperties.getBoolean("dalvik.vm.profilebootimage", false);

                        profileBootClassPath;

            default:

                throw new IllegalArgumentException("Invalid profile type:" + profileType);

        }