Merge "Avoid profile guided compilation for vmSafeMode" (7554be1e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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;