Merge "don't dex when installing an instant app" into oc-dev

am: d5f3bd46a1

Change-Id: Ia27a62acce14f8dbce07ceef942f0059ed8875cc
This commit is contained in:
Todd Kennedy
2017-05-18 19:45:12 +00:00
committed by android-build-merger

View File

@@ -17526,6 +17526,12 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
// dexopt can take some time to complete, so, for instant apps, we skip this
// step during installation. Instead, we'll take extra time the first time the
// instant app starts. It's preferred to do it this way to provide continuous
// progress to the user instead of mysteriously blocking somewhere in the
// middle of running an instant app.
if (!instantApp) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");
// Do not run PackageDexOptimizer through the local performDexOpt // Do not run PackageDexOptimizer through the local performDexOpt
// method because `pkg` may not be in `mPackages` yet. // method because `pkg` may not be in `mPackages` yet.
@@ -17537,6 +17543,7 @@ public class PackageManagerService extends IPackageManager.Stub
getOrCreateCompilerPackageStats(pkg), getOrCreateCompilerPackageStats(pkg),
mDexManager.isUsedByOtherApps(pkg.packageName)); mDexManager.isUsedByOtherApps(pkg.packageName));
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
// Notify BackgroundDexOptService that the package has been changed. // Notify BackgroundDexOptService that the package has been changed.
// If this is an update of a package which used to fail to compile, // If this is an update of a package which used to fail to compile,