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

Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b

Browse Source 
am: 7554be1e36

Change-Id: I4d34ab801e08034c7d54818cc0f313efa88edf69
This commit is contained in:
Mathieu Chartier
2016-09-06 22:38:18 +00:00
committed by android-build-merger
parent b24828bd77 7554be1e36
commit e65bf6d173
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -176,6 +176,16 @@ class PackageDexOptimizer {
isProfileGuidedFilter = false; isProfileGuidedFilter = false;
} }
// Disable profile guided compilation for vmSafeMode.
final boolean vmSafeMode = (pkg.applicationInfo.flags & ApplicationInfo.FLAG_VM_SAFE_MODE)
!= 0;
final boolean debuggable = (pkg.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE)
!= 0;
if (vmSafeMode) {
targetCompilerFilter = getNonProfileGuidedCompilerFilter(targetCompilerFilter);
isProfileGuidedFilter = false;
}
// If we're asked to take profile updates into account, check now. // If we're asked to take profile updates into account, check now.
boolean newProfile = false; boolean newProfile = false;
if (checkProfiles && isProfileGuidedFilter) { if (checkProfiles && isProfileGuidedFilter) {
@@ -187,9 +197,6 @@ class PackageDexOptimizer {
} }
} }
final boolean vmSafeMode = (pkg.applicationInfo.flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0;
final boolean debuggable = (pkg.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
boolean performedDexOpt = false; boolean performedDexOpt = false;
boolean successfulDexOpt = true; boolean successfulDexOpt = true;