Merge "Update ArtManagerService for new profilebootclasspath properties"

This commit is contained in:
Mathieu Chartier
2019-11-13 21:10:21 +00:00
committed by Gerrit Code Review

View File

@@ -317,9 +317,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);
}