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

Commit 52c8620c authored by Shubham Ajmera's avatar Shubham Ajmera
Browse files

Update DexFile#getDexOptNeeded usages to reflect API change 

Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf9)

Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa
parent 925a08df

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

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,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
@@ -428,7 +428,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;