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

Commit 4c0dbb5b authored by Andreas Gampe's avatar Andreas Gampe Committed by Android (Google) Code Review
Browse files

Merge "Package Manager: Use new DexFile function to upgrade filter" into nyc-dev

parents d1ed81e5 47c170a7

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

+9 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import static com.android.server.pm.Installer.DEXOPT_PUBLIC; 
import static com.android.server.pm.Installer.DEXOPT_SAFEMODE;

import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getFullCompilerFilter;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;



/**

 * Helper class for running dexopt command on packages.
@@ -144,9 +144,10 @@ class PackageDexOptimizer { 
                if (isUsedByOtherApps(path)) {

                    checkProfiles = false;



                    // TODO: Should we only upgrade to the non-profile-guided version? That is,

                    //       given verify-profile, should we move to interpret-only?

                    targetCompilerFilter = getFullCompilerFilter();

                    targetCompilerFilter = getNonProfileGuidedCompilerFilter(targetCompilerFilter);

                    if (DexFile.isProfileGuidedCompilerFilter(targetCompilerFilter)) {

                        throw new IllegalStateException(targetCompilerFilter);

                    }

                    isProfileGuidedFilter = false;



                    break;
@@ -181,6 +182,10 @@ class PackageDexOptimizer { 
                    return DEX_OPT_FAILED;

                }

                dexoptNeeded = adjustDexoptNeeded(dexoptNeeded);

                if (PackageManagerService.DEBUG_DEXOPT) {

                    Log.i(TAG, "DexoptNeeded for " + path + "@" + targetCompilerFilter + " is " +

                            dexoptNeeded);

                }



                final String dexoptType;

                String oatDir = null;

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

+6 −0
Original line number Diff line number Diff line
@@ -126,4 +126,10 @@ class PackageManagerServiceCompilerMapping { 
        return value;

    }



    /**

     * Return the non-profile-guided filter corresponding to the given filter.

     */

    public static String getNonProfileGuidedCompilerFilter(String filter) {

        return DexFile.getNonProfileGuidedCompilerFilter(filter);

    }

}