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

Commit ee006da8 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Converted more log points in AMS to use ActivityManagerDebugConfig. 

Change-Id: I59e777de30e2e9a3c7d086dc634129cd19135fab
parent 066be66d

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

+19 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class ActivityManagerDebugConfig { 
    static final boolean DEBUG_TRANSITION = DEBUG_ALL || false;

    static final boolean DEBUG_URI_PERMISSION = DEBUG_ALL || false;

    static final boolean DEBUG_USER_LEAVING = DEBUG_ALL || false;

    static final boolean DEBUG_VISBILITY = DEBUG_ALL || false;

    static final boolean DEBUG_VISIBILITY = DEBUG_ALL || false;



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

    static final String POSTFIX_BROADCAST = (APPEND_CATEGORY_NAME) ? "_Broadcast" : "";
@@ -80,11 +80,29 @@ class ActivityManagerDebugConfig { 
    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_LOCKSCREEN = (APPEND_CATEGORY_NAME) ? "_LOCKSCREEN" : "";

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

    static final String POSTFIX_MU = "_MU";

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

    static final String POSTFIX_PAUSE = (APPEND_CATEGORY_NAME) ? "_Pause" : "";

    static final String POSTFIX_POWER = (APPEND_CATEGORY_NAME) ? "_Power" : "";

    static final String POSTFIX_PROCESS_OBSERVERS = (APPEND_CATEGORY_NAME)

            ? "_ProcessObservers" : "";

    static final String POSTFIX_PROCESSES = (APPEND_CATEGORY_NAME) ? "_Processes" : "";

    static final String POSTFIX_PROVIDER = (APPEND_CATEGORY_NAME) ? "_Provider" : "";

    static final String POSTFIX_PSS = (APPEND_CATEGORY_NAME) ? "_Pss" : "";

    static final String POSTFIX_RESULTS = (APPEND_CATEGORY_NAME) ? "_Results" : "";

    static final String POSTFIX_RECENTS = (APPEND_CATEGORY_NAME) ? "_Recents" : "";

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

    static final String POSTFIX_SERVICE_EXECUTING =

            (APPEND_CATEGORY_NAME) ? "_ServiceExecuting" : "";

    static final String POSTFIX_STACK = (APPEND_CATEGORY_NAME) ? "_Stack" : "";

    static final String POSTFIX_SWITCH = (APPEND_CATEGORY_NAME) ? "_Switch" : "";

    static final String POSTFIX_TASKS = (APPEND_CATEGORY_NAME) ? "_Tasks" : "";

    static final String POSTFIX_THUMBNAILS = (APPEND_CATEGORY_NAME) ? "_Thumbnails" : "";

    static final String POSTFIX_TRANSITION = (APPEND_CATEGORY_NAME) ? "_Transition" : "";

    static final String POSTFIX_URI_PERMISSION = (APPEND_CATEGORY_NAME) ? "_UriPermission" : "";

    static final String POSTFIX_USER_LEAVING = (APPEND_CATEGORY_NAME) ? "_UserLeaving" : "";

    static final String POSTFIX_VISIBILITY = (APPEND_CATEGORY_NAME) ? "_Visibility" : "";



}

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

+131 −136

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −6
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.server.am;



import static com.android.server.am.ActivityManagerDebugConfig.*;

import static com.android.server.am.ActivityManagerService.DEBUG_SWITCH;

import static com.android.server.am.ActivityManagerService.DEBUG_THUMBNAILS;

import static com.android.server.am.TaskPersister.DEBUG_PERSISTER;

import static com.android.server.am.TaskPersister.DEBUG_RESTORER;

import static com.android.server.am.TaskRecord.INVALID_TASK_ID;
@@ -75,6 +73,8 @@ import java.util.Objects; 
 */

final class ActivityRecord {

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

    private static final String TAG_SWITCH = TAG + POSTFIX_SWITCH;

    private static final String TAG_THUMBNAILS = TAG + POSTFIX_THUMBNAILS;



    private static final boolean SHOW_ACTIVITY_START_TIME = true;

    static final boolean DEBUG_SAVED_STATE = ActivityStackSupervisor.DEBUG_SAVED_STATE;
@@ -354,7 +354,7 @@ final class ActivityRecord { 
            synchronized (mService) {

                ActivityRecord r = tokenToActivityRecordLocked(this);

                if (r != null) {

                    if (DEBUG_SWITCH) Log.v(TAG, "windowsGone(): " + r);

                    if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsGone(): " + r);

                    r.nowVisible = false;

                    return;

                }
@@ -863,7 +863,7 @@ final class ActivityRecord { 


    void updateThumbnailLocked(Bitmap newThumbnail, CharSequence description) {

        if (newThumbnail != null) {

            if (DEBUG_THUMBNAILS) Slog.i(TAG,

            if (DEBUG_THUMBNAILS) Slog.i(TAG_THUMBNAILS,

                    "Setting thumbnail of " + this + " to " + newThumbnail);

            boolean thumbnailUpdated = task.setLastThumbnail(newThumbnail);

            if (thumbnailUpdated && isPersistable()) {
@@ -1014,7 +1014,7 @@ final class ActivityRecord { 


    void windowsVisibleLocked() {

        mStackSupervisor.reportActivityVisibleLocked(this);

        if (DEBUG_SWITCH) Log.v(TAG, "windowsVisibleLocked(): " + this);

        if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsVisibleLocked(): " + this);

        if (!nowVisible) {

            nowVisible = true;

            lastVisibleTime = SystemClock.uptimeMillis();
@@ -1030,7 +1030,7 @@ final class ActivityRecord { 
                if (size > 0) {

                    for (int i = 0; i < size; i++) {

                        ActivityRecord r = mStackSupervisor.mWaitingVisibleActivities.get(i);

                        if (DEBUG_SWITCH) Log.v(TAG, "Was waiting for visible: " + r);

                        if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "Was waiting for visible: " + r);

                    }

                    mStackSupervisor.mWaitingVisibleActivities.clear();

                    mStackSupervisor.scheduleIdleLocked();

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

+131 −128

File changed.

Preview size limit exceeded, changes collapsed.

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

+85 −92

File changed.

Preview size limit exceeded, changes collapsed.