Merge "PackageManager: Skip dexopt on install for debuggable apps" (09a80d17) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18873,6 +18873,7 @@ public class PackageManagerService extends IPackageManager.Stub
	// 1) it is not forward locked.		// 1) it is not forward locked.
	// 2) it is not on on an external ASEC container.		// 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.		// 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		// 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		// complete, so we skip this step during installation. Instead, we'll take extra time
	@@ -18884,7 +18885,8 @@ public class PackageManagerService extends IPackageManager.Stub
	&& !forwardLocked		&& !forwardLocked
	&& !pkg.applicationInfo.isExternalAsec()		&& !pkg.applicationInfo.isExternalAsec()
	&& (!instantApp \|\| Global.getInt(mContext.getContentResolver(),		&& (!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) {		if (performDexopt) {
	Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");