Merge "Merge "PackageManager: Skip dexopt on install for debuggable apps" am: 5faf7291f0 am: 09a80d1797" into pi-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2018-04-24 00:34:07 +00:00
committed by Android (Google) Code Review

View File

@@ -17436,6 +17436,7 @@ public class PackageManagerService extends IPackageManager.Stub
// 1) it is not forward locked.
// 2) it is not on on an external ASEC container.
// 3) it is not an instant app or if it is then dexopt is enabled via gservices.
// 4) it is not debuggable.
//
// Note that we do not dexopt instant apps by default. dexopt can take some time to
// complete, so we skip this step during installation. Instead, we'll take extra time
@@ -17447,7 +17448,8 @@ public class PackageManagerService extends IPackageManager.Stub
&& !forwardLocked
&& !pkg.applicationInfo.isExternalAsec()
&& (!instantApp || Global.getInt(mContext.getContentResolver(),
Global.INSTANT_APP_DEXOPT_ENABLED, 0) != 0);
Global.INSTANT_APP_DEXOPT_ENABLED, 0) != 0)
&& ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) == 0);
if (performDexopt) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");