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

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

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

am: 7554be1e

Change-Id: I4d34ab801e08034c7d54818cc0f313efa88edf69
parents b24828bd 7554be1e

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

+10 −3
Original line number Diff line number Diff line
@@ -176,6 +176,16 @@ class PackageDexOptimizer { 
            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.

        boolean newProfile = false;

        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 successfulDexOpt = true;