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

Commit b3145221 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "[framework] Add check that classpath is up to date to getDexOptNeeded" am: 945b1dc4 

am: 8952f058

Change-Id: Iad6377ad17a93948ae41b23d7f49669577869669
parents ffb55f27 8952f058

core/java/com/android/internal/os/ZygoteInit.java

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ public class ZygoteInit { 
            try {

                dexoptNeeded = DexFile.getDexOptNeeded(

                    classPathElement, instructionSet, systemServerFilter,

                    false /* newProfile */, false /* downgrade */);

                    null /* classLoaderContext */, false /* newProfile */, false /* downgrade */);

            } catch (FileNotFoundException ignored) {

                // Do not add to the classpath.

                Log.w(TAG, "Missing classpath element for system server: " + classPathElement);

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

+9 −8
Original line number Diff line number Diff line
@@ -236,9 +236,10 @@ public class PackageDexOptimizer { 
     */

    @GuardedBy("mInstallLock")

    private int dexOptPath(PackageParser.Package pkg, String path, String isa,

            String compilerFilter, boolean profileUpdated, String sharedLibrariesPath,

            String compilerFilter, boolean profileUpdated, String classLoaderContext,

            int dexoptFlags, int uid, CompilerStats.PackageStats packageStats, boolean downgrade) {

        int dexoptNeeded = getDexoptNeeded(path, isa, compilerFilter, profileUpdated, downgrade);

        int dexoptNeeded = getDexoptNeeded(path, isa, compilerFilter, classLoaderContext,

                profileUpdated, downgrade);

        if (Math.abs(dexoptNeeded) == DexFile.NO_DEXOPT_NEEDED) {

            return DEX_OPT_SKIPPED;

        }
@@ -251,8 +252,8 @@ public class PackageDexOptimizer { 
        Log.i(TAG, "Running dexopt (dexoptNeeded=" + dexoptNeeded + ") on: " + path

                + " pkg=" + pkg.applicationInfo.packageName + " isa=" + isa

                + " dexoptFlags=" + printDexoptFlags(dexoptFlags)

                + " target-filter=" + compilerFilter + " oatDir=" + oatDir

                + " sharedLibraries=" + sharedLibrariesPath);

                + " targetFilter=" + compilerFilter + " oatDir=" + oatDir

                + " classLoaderContext=" + classLoaderContext);



        try {

            long startTime = System.currentTimeMillis();
@@ -261,7 +262,7 @@ public class PackageDexOptimizer { 
            // installd only uses downgrade flag for secondary dex files and ignores it for

            // primary dex files.

            mInstaller.dexopt(path, uid, pkg.packageName, isa, dexoptNeeded, oatDir, dexoptFlags,

                    compilerFilter, pkg.volumeUuid, sharedLibrariesPath, pkg.applicationInfo.seInfo,

                    compilerFilter, pkg.volumeUuid, classLoaderContext, pkg.applicationInfo.seInfo,

                    false /* downgrade*/);



            if (packageStats != null) {
@@ -508,11 +509,11 @@ public class PackageDexOptimizer { 
     * configuration (isa, compiler filter, profile).

     */

    private int getDexoptNeeded(String path, String isa, String compilerFilter,

            boolean newProfile, boolean downgrade) {

            String classLoaderContext, boolean newProfile, boolean downgrade) {

        int dexoptNeeded;

        try {

            dexoptNeeded = DexFile.getDexOptNeeded(path, isa, compilerFilter, newProfile,

                    downgrade);

            dexoptNeeded = DexFile.getDexOptNeeded(path, isa, compilerFilter, classLoaderContext,

                    newProfile, downgrade);

        } catch (IOException ioe) {

            Slog.w(TAG, "IOException reading apk: " + path, ioe);

            return DEX_OPT_FAILED;