Merge "Remove app_start_info_timestamps flag" into main (d0f69d3a) · Commits · e / os / android_frameworks_base

core/java/android/app/activity_manager.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -41,16 +41,6 @@ flag {
		bug: "317799821"
		}

		flag {
		namespace: "system_performance"
		name: "app_start_info_timestamps"
		description: "Additional timestamps."
		bug: "287153617"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "backstage_power"
		name: "skip_bg_mem_trim_on_fg_app"

core/java/android/view/ViewRootImpl.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -1217,7 +1217,6 @@ public final class ViewRootImpl implements ViewParent,
		private String mFpsTraceName;
		private String mLargestViewTraceName;

		private final boolean mAppStartInfoTimestampsFlagValue;
		private AtomicBoolean mAppStartTimestampsSent = new AtomicBoolean(false);
		private boolean mAppStartTrackingStarted = false;
		private long mRenderThreadDrawStartTimeNs = -1;
		@@ -1321,8 +1320,6 @@ public final class ViewRootImpl implements ViewParent,
		mSensitiveContentProtectionService = null;
		}

		mAppStartInfoTimestampsFlagValue = android.app.Flags.appStartInfoTimestamps();

		// Disable DRAW_WAKE_LOCK starting U.
		mDisableDrawWakeLock =
		CompatChanges.isChangeEnabled(DISABLE_DRAW_WAKE_LOCK) && disableDrawWakeLock();
		@@ -4641,7 +4638,7 @@ public final class ViewRootImpl implements ViewParent,

		// Only trigger once per {@link ViewRootImpl} instance, so don't add listener if
		// {link mTransactionCompletedTimeNs} has already been set.
		if (mAppStartInfoTimestampsFlagValue && !mAppStartTrackingStarted) {
		if (!mAppStartTrackingStarted) {
		mAppStartTrackingStarted = true;
		Transaction transaction = new Transaction();
		transaction.addTransactionCompletedListener(mSimpleExecutor,
		@@ -5888,7 +5885,7 @@ public final class ViewRootImpl implements ViewParent,
		mAttachInfo.mThreadedRenderer.draw(mView, mAttachInfo, this);

		// Only trigger once per {@link ViewRootImpl} instance.
		if (mAppStartInfoTimestampsFlagValue && mRenderThreadDrawStartTimeNs == -1) {
		if (mRenderThreadDrawStartTimeNs == -1) {
		mRenderThreadDrawStartTimeNs = timeNs;
		}
		} else {

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -5063,7 +5063,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		Binder.restoreCallingIdentity(origId);
		}

		if (android.app.Flags.appStartInfoTimestamps() && timestampApplicationOnCreateNs > 0) {
		if (timestampApplicationOnCreateNs > 0) {
		addStartInfoTimestampInternal(ApplicationStartInfo.START_TIMESTAMP_APPLICATION_ONCREATE,
		timestampApplicationOnCreateNs, UserHandle.getUserId(uid), uid);
		}

services/core/java/com/android/server/am/AppStartInfoTracker.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -399,10 +399,6 @@ public final class AppStartInfoTracker {
		return;
		}
		info.setLaunchMode(launchMode);
		if (!android.app.Flags.appStartInfoTimestamps()) {
		info.setStartupState(ApplicationStartInfo.STARTUP_STATE_FIRST_FRAME_DRAWN);
		checkCompletenessAndCallback(info);
		}
		}
		}

		@@ -1266,8 +1262,7 @@ public final class AppStartInfoTracker {

		startInfo.addStartupTimestamp(key, timestampNs);

		if (key == ApplicationStartInfo.START_TIMESTAMP_FIRST_FRAME
		&& android.app.Flags.appStartInfoTimestamps()) {
		if (key == ApplicationStartInfo.START_TIMESTAMP_FIRST_FRAME) {
		startInfo.setStartupState(ApplicationStartInfo.STARTUP_STATE_FIRST_FRAME_DRAWN);
		checkCompletenessAndCallback(startInfo);
		}

services/core/java/com/android/server/am/ProcessList.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -2604,10 +2604,8 @@ public final class ProcessList implements ProcessStateController.ProcessLruUpdat
		app.mProcessGroupCreated = true;
		}

		if (android.app.Flags.appStartInfoTimestamps()) {
		mAppStartInfoTracker.addTimestampToStart(app, forkTimeNs,
		ApplicationStartInfo.START_TIMESTAMP_FORK);
		}

		if (!regularZygote) {
		// webview and app zygote don't have the permission to create the nodes