Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7735233e authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Print duration in event log of major activity lifecycle"

parents 6120c41e 9ae09bc2

core/java/android/app/Activity.java

+26 −7
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ServiceManager.ServiceNotFoundException;

import android.os.StrictMode;

import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.text.Selection;
@@ -8304,13 +8305,15 @@ public class Activity extends ContextThemeWrapper 
        mIsInPictureInPictureMode = windowingMode == WINDOWING_MODE_PINNED;

        mShouldDockBigOverlays = getResources().getBoolean(R.bool.config_dockBigOverlayWindows);

        restoreHasCurrentPermissionRequest(icicle);

        final long startTime = SystemClock.uptimeMillis();

        if (persistentState != null) {

            onCreate(icicle, persistentState);

        } else {

            onCreate(icicle);

        }

        final long duration = SystemClock.uptimeMillis() - startTime;

        EventLogTags.writeWmOnCreateCalled(mIdent, getComponentName().getClassName(),

                "performCreate");

                "performCreate", duration);

        mActivityTransitionState.readState(icicle);



        mVisibleFromClient = !mWindow.getWindowStyle().getBoolean(
@@ -8332,8 +8335,11 @@ public class Activity extends ContextThemeWrapper 
        mFragments.noteStateNotSaved();

        mCalled = false;

        mFragments.execPendingActions();

        final long startTime = SystemClock.uptimeMillis();

        mInstrumentation.callActivityOnStart(this);

        EventLogTags.writeWmOnStartCalled(mIdent, getComponentName().getClassName(), reason);

        final long duration = SystemClock.uptimeMillis() - startTime;

        EventLogTags.writeWmOnStartCalled(mIdent, getComponentName().getClassName(), reason,

                duration);



        if (!mCalled) {

            throw new SuperNotCalledException(
@@ -8410,8 +8416,11 @@ public class Activity extends ContextThemeWrapper 
            }



            mCalled = false;

            final long startTime = SystemClock.uptimeMillis();

            mInstrumentation.callActivityOnRestart(this);

            EventLogTags.writeWmOnRestartCalled(mIdent, getComponentName().getClassName(), reason);

            final long duration = SystemClock.uptimeMillis() - startTime;

            EventLogTags.writeWmOnRestartCalled(mIdent, getComponentName().getClassName(), reason,

                    duration);

            if (!mCalled) {

                throw new SuperNotCalledException(

                    "Activity " + mComponent.toShortString() +
@@ -8438,9 +8447,12 @@ public class Activity extends ContextThemeWrapper 
        getAutofillClientController().onActivityPerformResume(followedByPause);



        mCalled = false;

        final long startTime = SystemClock.uptimeMillis();

        // mResumed is set by the instrumentation

        mInstrumentation.callActivityOnResume(this);

        EventLogTags.writeWmOnResumeCalled(mIdent, getComponentName().getClassName(), reason);

        final long duration = SystemClock.uptimeMillis() - startTime;

        EventLogTags.writeWmOnResumeCalled(mIdent, getComponentName().getClassName(), reason,

                duration);

        if (!mCalled) {

            throw new SuperNotCalledException(

                "Activity " + mComponent.toShortString() +
@@ -8483,9 +8495,11 @@ public class Activity extends ContextThemeWrapper 
        mDoReportFullyDrawn = false;

        mFragments.dispatchPause();

        mCalled = false;

        final long startTime = SystemClock.uptimeMillis();

        onPause();

        final long duration = SystemClock.uptimeMillis() - startTime;

        EventLogTags.writeWmOnPausedCalled(mIdent, getComponentName().getClassName(),

                "performPause");

                "performPause", duration);

        mResumed = false;

        if (!mCalled && getApplicationInfo().targetSdkVersion

                >= android.os.Build.VERSION_CODES.GINGERBREAD) {
@@ -8529,8 +8543,11 @@ public class Activity extends ContextThemeWrapper 
            mFragments.dispatchStop();



            mCalled = false;

            final long startTime = SystemClock.uptimeMillis();

            mInstrumentation.callActivityOnStop(this);

            EventLogTags.writeWmOnStopCalled(mIdent, getComponentName().getClassName(), reason);

            final long duration = SystemClock.uptimeMillis() - startTime;

            EventLogTags.writeWmOnStopCalled(mIdent, getComponentName().getClassName(), reason,

                    duration);

            if (!mCalled) {

                throw new SuperNotCalledException(

                    "Activity " + mComponent.toShortString() +
@@ -8564,9 +8581,11 @@ public class Activity extends ContextThemeWrapper 
        mDestroyed = true;

        mWindow.destroy();

        mFragments.dispatchDestroy();

        final long startTime = SystemClock.uptimeMillis();

        onDestroy();

        final long duration = SystemClock.uptimeMillis() - startTime;

        EventLogTags.writeWmOnDestroyCalled(mIdent, getComponentName().getClassName(),

                "performDestroy");

                "performDestroy", duration);

        mFragments.doLoaderDestroy();

        if (mVoiceInteractor != null) {

            mVoiceInteractor.detachActivity();

core/java/android/app/EventLogTags.logtags

+8 −8
Original line number Diff line number Diff line 
# See system/core/logcat/event.logtags for a description of the format of this file.

# See system/logging/logcat/event.logtags for a description of the format of this file.



option java_package android.app
@@ -6,21 +6,21 @@ option java_package android.app 
# google3/googledata/wireless/android/provisioning/gservices.config !!

#

# The activity's onPause has been called.

30021 wm_on_paused_called (Token|1|5),(Component Name|3),(Reason|3)

30021 wm_on_paused_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)

# The activity's onResume has been called.

30022 wm_on_resume_called (Token|1|5),(Component Name|3),(Reason|3)

30022 wm_on_resume_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)



# The activity's onStop has been called.

30049 wm_on_stop_called (Token|1|5),(Component Name|3),(Reason|3)

30049 wm_on_stop_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)



# The activity's onCreate has been called.

30057 wm_on_create_called (Token|1|5),(Component Name|3),(Reason|3)

30057 wm_on_create_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)

# The activity's onRestart has been called.

30058 wm_on_restart_called (Token|1|5),(Component Name|3),(Reason|3)

30058 wm_on_restart_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)

# The activity's onStart has been called.

30059 wm_on_start_called (Token|1|5),(Component Name|3),(Reason|3)

30059 wm_on_start_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)

# The activity's onDestroy has been called.

30060 wm_on_destroy_called (Token|1|5),(Component Name|3),(Reason|3)

30060 wm_on_destroy_called (Token|1|5),(Component Name|3),(Reason|3),(time|2|3)

# The activity's onActivityResult has been called.

30062 wm_on_activity_result_called (Token|1|5),(Component Name|3),(Reason|3)