diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-04-07 18:03:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-07 18:03:35 +0000 |
| commit | 6a17f60166082227a5a644f9114db46a0ade73f0 (patch) | |
| tree | d90dc0834ef8dff35bf1ccdde18ff31824da53aa /services | |
| parent | 558184f52fa7822a0bde230a93e552f137ac91a4 (diff) | |
| parent | 36b26adde8091bcf8e1d5aff6ae393278fef12c8 (diff) | |
| download | frameworks_base-6a17f60166082227a5a644f9114db46a0ade73f0.zip frameworks_base-6a17f60166082227a5a644f9114db46a0ade73f0.tar.gz frameworks_base-6a17f60166082227a5a644f9114db46a0ade73f0.tar.bz2 | |
Merge "Unnecessary dexopt in installPackageLI"
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 67d3cbe..bb8a785 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10447,13 +10447,13 @@ public class PackageManagerService extends IPackageManager.Stub { return; } + // Call with SCAN_NO_DEX, since dexopt has already been made if (replace) { - // Call replacePackageLI with SCAN_NO_DEX, since we already made dexopt replacePackageLI(pkg, parseFlags, scanFlags | SCAN_REPLACING | SCAN_NO_DEX, args.user, installerPackageName, res); } else { - installNewPackageLI(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES, - args.user, installerPackageName, res); + installNewPackageLI(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES + | SCAN_NO_DEX, args.user, installerPackageName, res); } synchronized (mPackages) { final PackageSetting ps = mSettings.mPackages.get(pkgName); |