Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update ArtManagerService for new profilebootclasspath properties"

Browse Source 
am: c62f571265

Change-Id: If7af1c40d793c9c691f0284d9544858e100f675e
This commit is contained in:
Mathieu Chartier
2019-11-13 13:19:18 -08:00
committed by android-build-merger
parent 59318bab67 c62f571265
commit 5b790b7612
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/dex/ArtManagerService.java
View File

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