Merge "Add more traces for activity callback" (14d562ea) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -8364,11 +8364,17 @@ public class Activity extends ContextThemeWrapper
		}

		final void performNewIntent(@NonNull Intent intent) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "performNewIntent");
		mCanEnterPictureInPicture = true;
		onNewIntent(intent);
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}

		final void performStart(String reason) {
		if (Trace.isTagEnabled(Trace.TRACE_TAG_WINDOW_MANAGER)) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "performStart:"
		+ mComponent.getClassName());
		}
		dispatchActivityPreStarted();
		mActivityTransitionState.setEnterActivityOptions(this, getActivityOptions());
		mFragments.noteStateNotSaved();
		@@ -8415,6 +8421,7 @@ public class Activity extends ContextThemeWrapper

		mActivityTransitionState.enterReady(this);
		dispatchActivityPostStarted();
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}

		/**
		@@ -8424,6 +8431,7 @@ public class Activity extends ContextThemeWrapper
		* multiple lifecycle transitions is in progress.
		*/
		final void performRestart(boolean start, String reason) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "performRestart");
		mCanEnterPictureInPicture = true;
		mFragments.noteStateNotSaved();

		@@ -8469,6 +8477,7 @@ public class Activity extends ContextThemeWrapper
		performStart(reason);
		}
		}
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}

		final void performResume(boolean followedByPause, String reason) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -3708,12 +3708,14 @@ public final class ActivityThread extends ClientTransactionHandler
		// Call postOnCreate()
		if (pendingActions.shouldCallOnPostCreate()) {
		activity.mCalled = false;
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "onPostCreate");
		if (r.isPersistable()) {
		mInstrumentation.callActivityOnPostCreate(activity, r.state,
		r.persistentState);
		} else {
		mInstrumentation.callActivityOnPostCreate(activity, r.state);
		}
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		if (!activity.mCalled) {
		throw new SuperNotCalledException(
		"Activity " + r.intent.getComponent().toShortString()