From 52c8620c1945de45f22c1e62dcb69ddadca07675 Mon Sep 17 00:00:00 2001 From: Shubham Ajmera Date: Mon, 24 Jul 2017 15:21:04 -0700 Subject: [PATCH] Update DexFile#getDexOptNeeded usages to reflect API change Test: make and boot Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51 Bug: 36598475 (partially cherry-picked from commit 246dccf9327631597767afe418ce43ae6d07d102) Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa --- core/java/com/android/internal/os/ZygoteInit.java | 2 +- services/core/java/com/android/server/pm/PackageDexOptimizer.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index fdc723e8d424..cb1d9ac9ca1c 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -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); diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index 2b7bd3442cc7..5021f2f0162d 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -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; -- 2.11.0