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

Commit 0cb10347 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Convert some log points to in AMS to use ActivityManagerDebugConfig class."

parents 422cb3c6 3ab9a27e

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

+13 −8
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ class ActivityManagerDebugConfig { 
    // will be tagged with their class names instead fot the generic tag.

    static final boolean TAG_WITH_CLASS_NAME = false;



    // While debugging it is sometimes useful to have the category name of the log prepended to the

    // While debugging it is sometimes useful to have the category name of the log appended to the

    // base log tag to make sifting through logs with the same base tag easier. By setting this

    // constant to true, the category name of the log point will be prepended to the log tag.

    static final boolean PREPEND_CATEGORY_NAME = false;

    // constant to true, the category name of the log point will be appended to the log tag.

    static final boolean APPEND_CATEGORY_NAME = false;



    // Default log tag for the activity manager package.

    static final String TAG_AM = "ActivityManager";
@@ -74,12 +74,17 @@ class ActivityManagerDebugConfig { 
    static final boolean DEBUG_USER_LEAVING = DEBUG_ALL || false;

    static final boolean DEBUG_VISBILITY = DEBUG_ALL || false;



    static final String POSTFIX_BACKUP = (PREPEND_CATEGORY_NAME) ? "_Backup" : "";

    static final String POSTFIX_BROADCAST = (PREPEND_CATEGORY_NAME) ? "_Broadcast" : "";

    static final String POSTFIX_CLEANUP = (PREPEND_CATEGORY_NAME) ? "_Cleanup" : "";

    static final String POSTFIX_BACKUP = (APPEND_CATEGORY_NAME) ? "_Backup" : "";

    static final String POSTFIX_BROADCAST = (APPEND_CATEGORY_NAME) ? "_Broadcast" : "";

    static final String POSTFIX_CLEANUP = (APPEND_CATEGORY_NAME) ? "_Cleanup" : "";

    static final String POSTFIX_CONFIGURATION = (APPEND_CATEGORY_NAME) ? "_Configuration" : "";

    static final String POSTFIX_FOCUS = (APPEND_CATEGORY_NAME) ? "_Focus" : "";

    static final String POSTFIX_IMMERSIVE = (APPEND_CATEGORY_NAME) ? "_Immersive" : "";

    static final String POSTFIX_LRU = (APPEND_CATEGORY_NAME) ? "_LRU" : "";

    static final String POSTFIX_MU = "_MU";

    static final String POSTFIX_SERVICE = (PREPEND_CATEGORY_NAME) ? "_Service" : "";

    static final String POSTFIX_OOM_ADJ = (APPEND_CATEGORY_NAME) ? "_OomAdj" : "";

    static final String POSTFIX_SERVICE = (APPEND_CATEGORY_NAME) ? "_Service" : "";

    static final String POSTFIX_SERVICE_EXECUTING =

            (PREPEND_CATEGORY_NAME) ? "_ServiceExecuting" : "";

            (APPEND_CATEGORY_NAME) ? "_ServiceExecuting" : "";



}

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

+70 −80

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import java.util.Objects; 
final class ActivityRecord {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityRecord" : TAG_AM;



    private static final boolean SHOW_ACTIVITY_START_TIME = true;

    static final boolean DEBUG_SAVED_STATE = ActivityStackSupervisor.DEBUG_SAVED_STATE;

    final public static String RECENTS_PACKAGE_NAME = "com.android.systemui.recents";
@@ -939,7 +940,7 @@ final class ActivityRecord { 
            final long thisTime = curTime - fullyDrawnStartTime;

            final long totalTime = stack.mFullyDrawnStartTime != 0

                    ? (curTime - stack.mFullyDrawnStartTime) : thisTime;

            if (ActivityManagerService.SHOW_ACTIVITY_START_TIME) {

            if (SHOW_ACTIVITY_START_TIME) {

                Trace.asyncTraceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER, "drawing", 0);

                EventLog.writeEvent(EventLogTags.AM_ACTIVITY_FULLY_DRAWN_TIME,

                        userId, System.identityHashCode(this), shortComponentName,
@@ -973,7 +974,7 @@ final class ActivityRecord { 
        final long thisTime = curTime - displayStartTime;

        final long totalTime = stack.mLaunchStartTime != 0

                ? (curTime - stack.mLaunchStartTime) : thisTime;

        if (ActivityManagerService.SHOW_ACTIVITY_START_TIME) {

        if (SHOW_ACTIVITY_START_TIME) {

            Trace.asyncTraceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching", 0);

            EventLog.writeEvent(EventLogTags.AM_ACTIVITY_LAUNCH_TIME,

                    userId, System.identityHashCode(this), shortComponentName,

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

+20 −20

File changed.

Preview size limit exceeded, changes collapsed.

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

+12 −11

File changed.

Preview size limit exceeded, changes collapsed.