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

Merge "PackageManager: Don't fail app installs if dexopt fails." into nyc-dev

Browse Source
This commit is contained in:
Narayan Kamath
2016-06-20 15:19:29 +00:00
committed by Android (Google) Code Review
parent 6918675fa1 99407db8dd
commit 5ae42bb661
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15132,16 +15132,13 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");
// Do not run PackageDexOptimizer through the local performDexOpt // Do not run PackageDexOptimizer through the local performDexOpt
// method because `pkg` is not in `mPackages` yet. // method because `pkg` may not be in `mPackages` yet.
int result = mPackageDexOptimizer.performDexOpt(pkg, pkg.usesLibraryFiles, //
// Also, don't fail application installs if the dexopt step fails.
mPackageDexOptimizer.performDexOpt(pkg, pkg.usesLibraryFiles,
null /* instructionSets */, false /* checkProfiles */, null /* instructionSets */, false /* checkProfiles */,
getCompilerFilterForReason(REASON_INSTALL)); getCompilerFilterForReason(REASON_INSTALL));
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
if (result == PackageDexOptimizer.DEX_OPT_FAILED) {
String msg = "Extracting package failed for " + pkgName;
res.setError(INSTALL_FAILED_DEXOPT, msg);
return;
}
// Notify BackgroundDexOptService that the package has been changed. // Notify BackgroundDexOptService that the package has been changed.
// If this is an update of a package which used to fail to compile, // If this is an update of a package which used to fail to compile,