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

Commit 5b790b76 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Update ArtManagerService for new profilebootclasspath properties" 

am: c62f5712

Change-Id: If7af1c40d793c9c691f0284d9544858e100f675e
parents 59318bab c62f5712

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

        }

        }