From 75bff7cca024d64b090f2104ed9a3be600c27fc5 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Mon, 6 Apr 2015 19:04:08 -0700 Subject: [PATCH] Unnecessary dexopt in installPackageLI When a new package is created, installNewPackageLI does not need to call dexopt, since it has already been made. Bug: 19550105 Bug: 20087446 Change-Id: If6b05bea590eea5f95efebb22a67ccd8cdf632c2 --- .../java/com/android/server/pm/PackageManagerService.java | 6 +++--- 1 file 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 e7ba582f757cc..4fea889e3431a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -11147,13 +11147,13 @@ public class PackageManagerService extends IPackageManager.Stub { startIntentFilterVerifications(args.user.getIdentifier(), pkg); + // 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, volumeUuid, res); } else { - installNewPackageLI(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES, - args.user, installerPackageName, volumeUuid, res); + installNewPackageLI(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES + | SCAN_NO_DEX, args.user, installerPackageName, volumeUuid, res); } synchronized (mPackages) { final PackageSetting ps = mSettings.mPackages.get(pkgName);