Merge "Add ART optimization dimension to reportFullyDrawn" (f5d8e97d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -376,6 +376,13 @@ class ActivityMetricsLogger {
		return -1;
		}
		}

		PackageOptimizationInfo getPackageOptimizationInfo(ArtManagerInternal artManagerInternal) {
		return artManagerInternal == null \|\| launchedActivityAppRecordRequiredAbi == null
		? PackageOptimizationInfo.createWithNoInfo()
		: artManagerInternal.getPackageOptimizationInfo(applicationInfo,
		launchedActivityAppRecordRequiredAbi, launchedActivityName);
		}
		}

		ActivityMetricsLogger(ActivityStackSupervisor supervisor, Looper looper) {
		@@ -836,14 +843,8 @@ class ActivityMetricsLogger {
		info.bindApplicationDelayMs);
		}
		builder.addTaggedData(APP_TRANSITION_WINDOWS_DRAWN_DELAY_MS, info.windowsDrawnDelayMs);
		final ArtManagerInternal artManagerInternal = getArtManagerInternal();
		final PackageOptimizationInfo packageOptimizationInfo =
		(artManagerInternal == null) \|\| (info.launchedActivityAppRecordRequiredAbi == null)
		? PackageOptimizationInfo.createWithNoInfo()
		: artManagerInternal.getPackageOptimizationInfo(
		info.applicationInfo,
		info.launchedActivityAppRecordRequiredAbi,
		info.launchedActivityName);
		info.getPackageOptimizationInfo(getArtManagerInternal());
		builder.addTaggedData(PACKAGE_OPTIMIZATION_COMPILATION_REASON,
		packageOptimizationInfo.getCompilationReason());
		builder.addTaggedData(PACKAGE_OPTIMIZATION_COMPILATION_FILTER,
		@@ -962,6 +963,8 @@ class ActivityMetricsLogger {
		builder.addTaggedData(APP_TRANSITION_PROCESS_RUNNING,
		info.mProcessRunning ? 1 : 0);
		mMetricsLogger.write(builder);
		final PackageOptimizationInfo packageOptimizationInfo =
		infoSnapshot.getPackageOptimizationInfo(getArtManagerInternal());
		FrameworkStatsLog.write(
		FrameworkStatsLog.APP_START_FULLY_DRAWN,
		info.mLastLaunchedActivity.info.applicationInfo.uid,
		@@ -971,7 +974,9 @@ class ActivityMetricsLogger {
		: FrameworkStatsLog.APP_START_FULLY_DRAWN__TYPE__WITHOUT_BUNDLE,
		info.mLastLaunchedActivity.info.name,
		info.mProcessRunning,
		startupTimeMs);
		startupTimeMs,
		packageOptimizationInfo.getCompilationReason(),
		packageOptimizationInfo.getCompilationFilter());

		// Ends the trace started at the beginning of this function. This is located here to allow
		// the trace slice to have a noticable duration.