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

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

Browse Source
This commit is contained in:
Shubham Ajmera
2017-07-24 19:11:29 +00:00
committed by Gerrit Code Review
parent c0a4f5357e d4185538dc
commit 515e6443aa
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,7 +512,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

@@ -405,7 +405,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;

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2264,7 +2264,7 @@ public class PackageManagerService extends IPackageManager.Stub {
int dexoptNeeded = DexFile.getDexOptNeeded( int dexoptNeeded = DexFile.getDexOptNeeded(
lib, dexCodeInstructionSet, lib, dexCodeInstructionSet,
getCompilerFilterForReason(REASON_SHARED_APK), getCompilerFilterForReason(REASON_SHARED_APK),
false /* newProfile */); false /* newProfile */, false /* downgrade */);
if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) { if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
mInstaller.dexopt(lib, Process.SYSTEM_UID, "*", mInstaller.dexopt(lib, Process.SYSTEM_UID, "*",
dexCodeInstructionSet, dexoptNeeded, null, dexCodeInstructionSet, dexoptNeeded, null,