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

Commit 515e6443 authored by Shubham Ajmera's avatar Shubham Ajmera Committed by Gerrit Code Review
Browse files

Merge "Update DexFile#getDexOptNeeded usages to reflect API change"

parents c0a4f535 d4185538

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

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

                dexoptNeeded = DexFile.getDexOptNeeded(

                    classPathElement, instructionSet, "speed",

                    false /* newProfile */);

                    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

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ public class PackageDexOptimizer { 
            boolean newProfile) {

        int dexoptNeeded;

        try {

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

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

                    false /* downgrade */);

        } catch (IOException ioe) {

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

            return DEX_OPT_FAILED;

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

+1 −1
Original line number Diff line number Diff line
@@ -2264,7 +2264,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                            int dexoptNeeded = DexFile.getDexOptNeeded(

                                    lib, dexCodeInstructionSet,

                                    getCompilerFilterForReason(REASON_SHARED_APK),

                                    false /* newProfile */);

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

                            if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {

                                mInstaller.dexopt(lib, Process.SYSTEM_UID, "*",

                                        dexCodeInstructionSet, dexoptNeeded, null,