Merge "Unnecessary dexopt in installPackageLI"

This commit is contained in:
Fyodor Kupolov
2015-04-07 18:03:34 +00:00
committed by Gerrit Code Review

View File

@@ -10447,13 +10447,13 @@ public class PackageManagerService extends IPackageManager.Stub {
return; return;
} }
// Call with SCAN_NO_DEX, since dexopt has already been made
if (replace) { if (replace) {
// Call replacePackageLI with SCAN_NO_DEX, since we already made dexopt
replacePackageLI(pkg, parseFlags, scanFlags | SCAN_REPLACING | SCAN_NO_DEX, args.user, replacePackageLI(pkg, parseFlags, scanFlags | SCAN_REPLACING | SCAN_NO_DEX, args.user,
installerPackageName, res); installerPackageName, res);
} else { } else {
installNewPackageLI(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES, installNewPackageLI(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES
args.user, installerPackageName, res); | SCAN_NO_DEX, args.user, installerPackageName, res);
} }
synchronized (mPackages) { synchronized (mPackages) {
final PackageSetting ps = mSettings.mPackages.get(pkgName); final PackageSetting ps = mSettings.mPackages.get(pkgName);