drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 77e46d21: am 6a17f601: Merge "Unnecessary dexopt in installPackageLI"

Browse Source 
* commit '77e46d214db035f150e8522fad03edec913939e8':
  Unnecessary dexopt in installPackageLI
This commit is contained in:
Fyodor Kupolov
2015-04-07 18:35:10 +00:00
committed by Android Git Automerger
parent 06adabdbec 77e46d214d
commit 88d9797aa8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10470,13 +10470,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);