Merge "[view compilation] Add separate compilation property" (a6f40d9d) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -449,8 +449,7 @@ public class PackageManagerService extends IPackageManager.Stub

		private static final long BACKUP_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(60);

		private static final boolean PRECOMPILED_LAYOUT_ENABLED =
		SystemProperties.getBoolean("view.precompiled_layout_enabled", false);
		private static final String PRECOMPILE_LAYOUTS = "pm.precompile_layouts";

		private static final int RADIO_UID = Process.PHONE_UID;
		private static final int LOG_UID = Process.LOG_UID;
		@@ -9119,7 +9118,7 @@ public class PackageManagerService extends IPackageManager.Stub
		pkgCompilationReason = PackageManagerService.REASON_BACKGROUND_DEXOPT;
		}

		if (PRECOMPILED_LAYOUT_ENABLED) {
		if (SystemProperties.getBoolean(PRECOMPILE_LAYOUTS, false)) {
		mArtManagerService.compileLayouts(pkg);
		}

		@@ -16211,7 +16210,7 @@ public class PackageManagerService extends IPackageManager.Stub

		if (performDexopt) {
		// Compile the layout resources.
		if (PRECOMPILED_LAYOUT_ENABLED) {
		if (SystemProperties.getBoolean(PRECOMPILE_LAYOUTS, false)) {
		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "compileLayouts");
		mViewCompiler.compileLayouts(pkg);
		Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);