diff options
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 63afdd86bd93..325a15f1cb30 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3030,8 +3030,6 @@ public class DevicePolicyManager { * @param lockdownEnabled {@code true} to disallow networking when the VPN is not connected or * {@code false} otherwise. This carries the risk that any failure of the VPN provider * could break networking for all apps. This has no effect when clearing. - * @return {@code true} if the package is set as always-on VPN controller; {@code false} - * otherwise. * @throws SecurityException if {@code admin} is not a device or a profile owner. * @throws NameNotFoundException if {@code vpnPackage} is not installed. * @throws UnsupportedOperationException if {@code vpnPackage} exists but does not support being diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ada0a6be98df..c8307d810066 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -15132,16 +15132,13 @@ public class PackageManagerService extends IPackageManager.Stub { } Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt"); // Do not run PackageDexOptimizer through the local performDexOpt - // method because `pkg` is not in `mPackages` yet. - int result = mPackageDexOptimizer.performDexOpt(pkg, pkg.usesLibraryFiles, + // method because `pkg` may not be in `mPackages` yet. + // + // Also, don't fail application installs if the dexopt step fails. + mPackageDexOptimizer.performDexOpt(pkg, pkg.usesLibraryFiles, null /* instructionSets */, false /* checkProfiles */, getCompilerFilterForReason(REASON_INSTALL)); 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. // If this is an update of a package which used to fail to compile, |