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

Commit a817838e authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge "Avoid profile guided compilation for vmSafeMode"

parents 1cd62480 41e4a376

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;