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

Commit c62f5712 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge "Update ArtManagerService for new profilebootclasspath properties"

parents a98026f7 3926ad2c

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

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

            case ArtManager.PROFILE_APPS :

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

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

            case ArtManager.PROFILE_BOOT_IMAGE:

            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) &&

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

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

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

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

                        profileBootClassPath;

            default:

            default:

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

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

        }

        }