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

Commit 76ac4027 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Update DexFile.getDexOptNeeded in framework"

parents 451ff5a8 6ce213fe

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

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

            for (String classPathElement : classPathElements) {

                final int dexoptNeeded = DexFile.getDexOptNeeded(

                        classPathElement, "*", instructionSet, false /* defer */);

                        classPathElement, instructionSet, DexFile.COMPILATION_TYPE_FULL);

                if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {

                    installer.dexopt(classPathElement, Process.SYSTEM_UID, instructionSet,

                            dexoptNeeded, 0 /*dexFlags*/);

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

+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ final class PackageDexOptimizer { 
                    dexoptNeeded = DexFile.DEX2OAT_NEEDED;

                } else {

                    try {

                        dexoptNeeded = DexFile.getDexOptNeeded(path, pkg.packageName,

                                dexCodeInstructionSet, defer);

                        dexoptNeeded = DexFile.getDexOptNeeded(path,

                                dexCodeInstructionSet, DexFile.COMPILATION_TYPE_FULL);

                    } catch (IOException ioe) {

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

                        return DEX_OPT_FAILED;

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

+4 −2
Original line number Diff line number Diff line
@@ -1980,7 +1980,8 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        }















                        try {













                            int dexoptNeeded = DexFile.getDexOptNeeded(lib, null, dexCodeInstructionSet, false);













                            int dexoptNeeded = DexFile.getDexOptNeeded(lib, dexCodeInstructionSet,













                                    DexFile.COMPILATION_TYPE_FULL);















                            if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {















                                alreadyDexOpted.add(lib);















                                mInstaller.dexopt(lib, Process.SYSTEM_UID, dexCodeInstructionSet,










@@ -2030,7 +2031,8 @@ public class PackageManagerService extends IPackageManager.Stub {













                            continue;















                        }















                        try {













                            int dexoptNeeded = DexFile.getDexOptNeeded(path, null, dexCodeInstructionSet, false);













                            int dexoptNeeded = DexFile.getDexOptNeeded(path, dexCodeInstructionSet,













                                    DexFile.COMPILATION_TYPE_FULL);















                            if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {















                                mInstaller.dexopt(path, Process.SYSTEM_UID, dexCodeInstructionSet,















                                        dexoptNeeded, DEXOPT_PUBLIC /*dexFlags*/);