Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update DexFile#getDexOptNeeded usages to reflect API change

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

Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa
This commit is contained in:
Shubham Ajmera
2017-07-24 15:21:04 -07:00
parent 925a08df7c
commit 52c8620c19
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -548,7 +548,7 @@ public class ZygoteInit {
try { try {
dexoptNeeded = DexFile.getDexOptNeeded( dexoptNeeded = DexFile.getDexOptNeeded(
classPathElement, instructionSet, "speed", classPathElement, instructionSet, "speed",
false /* newProfile */); false /* newProfile */, false /* downgrade */);
} catch (FileNotFoundException ignored) { } catch (FileNotFoundException ignored) {
// Do not add to the classpath. // Do not add to the classpath.
Log.w(TAG, "Missing classpath element for system server: " + classPathElement); Log.w(TAG, "Missing classpath element for system server: " + classPathElement);

3
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -428,7 +428,8 @@ public class PackageDexOptimizer {
boolean newProfile) { boolean newProfile) {
int dexoptNeeded; int dexoptNeeded;
try { try {
dexoptNeeded = DexFile.getDexOptNeeded(path, isa, compilerFilter, newProfile); dexoptNeeded = DexFile.getDexOptNeeded(path, isa, compilerFilter, newProfile,
false /* downgrade */);
} catch (IOException ioe) { } catch (IOException ioe) {
Slog.w(TAG, "IOException reading apk: " + path, ioe); Slog.w(TAG, "IOException reading apk: " + path, ioe);
return DEX_OPT_FAILED; return DEX_OPT_FAILED;