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

Commit b4132993 authored by Winson Chung's avatar Winson Chung
Browse files

Dump the visible list for easier debugging 

- For each task info returned for the visible task list, also dump some
  vars to make it easier to debug

Bug: 111272828
Test: adb shell dumpsys activity recents

Change-Id: Ie754cebd00ba07917054b9e5e3a69e0f72a072aa
parent 6b6a71a5

core/java/android/app/ActivityManager.java

+38 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.app;



import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;



import android.Manifest;

import android.annotation.DrawableRes;

import android.annotation.IntDef;
@@ -28,7 +30,6 @@ import android.annotation.TestApi; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.ConfigurationInfo;

import android.content.pm.IPackageDataObserver;
@@ -60,7 +61,6 @@ import android.os.ServiceManager; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.WorkSource;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.DisplayMetrics;

import android.util.Singleton;
@@ -1394,6 +1394,42 @@ public class ActivityManager { 
                return new RecentTaskInfo[size];

            }

        };



        /**

         * @hide

         */

        public void dump(PrintWriter pw, String indent) {

            final String activityType = WindowConfiguration.activityTypeToString(

                    configuration.windowConfiguration.getActivityType());

            final String windowingMode = WindowConfiguration.activityTypeToString(

                    configuration.windowConfiguration.getActivityType());



            pw.println(); pw.print("   ");

            pw.print(" id=" + persistentId);

            pw.print(" stackId=" + stackId);

            pw.print(" userId=" + userId);

            pw.print(" hasTask=" + (id != -1));

            pw.print(" lastActiveTime=" + lastActiveTime);

            pw.println(); pw.print("   ");

            pw.print(" baseIntent=" + baseIntent);

            pw.println(); pw.print("   ");

            pw.print(" isExcluded="

                    + ((baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0));

            pw.print(" activityType=" + activityType);

            pw.print(" windowingMode=" + windowingMode);

            pw.print(" supportsSplitScreenMultiWindow=" + supportsSplitScreenMultiWindow);

            if (taskDescription != null) {

                pw.println(); pw.print("   ");

                final ActivityManager.TaskDescription td = taskDescription;

                pw.print(" taskDescription {");

                pw.print(" colorBackground=#" + Integer.toHexString(td.getBackgroundColor()));

                pw.print(" colorPrimary=#" + Integer.toHexString(td.getPrimaryColor()));

                pw.print(" iconRes=" + (td.getIconResource() != 0));

                pw.print(" iconBitmap=" + (td.getIconFilename() != null

                        || td.getInMemoryIcon() != null));

                pw.println(" }");

            }

        }

    }



    /**

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

+47 −13
Original line number Diff line number Diff line
@@ -26,10 +26,12 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; 
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;



import static android.os.Process.SYSTEM_UID;

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

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

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;
@@ -497,7 +499,7 @@ class RecentTasks { 
            if (tr.userId == userId) {

                if(DEBUG_TASKS) Slog.i(TAG_TASKS,

                        "remove RecentTask " + tr + " when finishing user" + userId);

                remove(mTasks.get(i));

                remove(tr);

            }

        }

    }
@@ -589,8 +591,7 @@ class RecentTasks { 
            }

            if (task.autoRemoveRecents && task.getTopActivity() == null) {

                // This situation is broken, and we should just get rid of it now.

                mTasks.remove(i);

                notifyTaskRemoved(task, !TRIMMED);

                remove(task);

                Slog.w(TAG, "Removing auto-remove without activity: " + task);

                continue;

            }
@@ -636,8 +637,7 @@ class RecentTasks { 
                    if (app == NO_APPLICATION_INFO_TOKEN

                            || (app.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {

                        // Doesn't exist any more! Good-bye.

                        mTasks.remove(i);

                        notifyTaskRemoved(task, !TRIMMED);

                        remove(task);

                        Slog.w(TAG, "Removing no longer valid recent: " + task);

                        continue;

                    } else {
@@ -734,11 +734,21 @@ class RecentTasks { 
     */

    ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum, int flags,

            boolean getTasksAllowed, boolean getDetailedTasks, int userId, int callingUid) {

        return new ParceledListSlice<>(getRecentTasksImpl(maxNum, flags, getTasksAllowed,

                getDetailedTasks, userId, callingUid));

    }





    /**

     * @return the list of recent tasks for presentation.

     */

    ArrayList<ActivityManager.RecentTaskInfo> getRecentTasksImpl(int maxNum, int flags,

            boolean getTasksAllowed, boolean getDetailedTasks, int userId, int callingUid) {

        final boolean withExcluded = (flags & RECENT_WITH_EXCLUDED) != 0;



        if (!mService.mAm.isUserRunning(userId, FLAG_AND_UNLOCKED)) {

            Slog.i(TAG, "user " + userId + " is still locked. Cannot load recents");

            return ParceledListSlice.emptyList();

            return new ArrayList<>();

        }

        loadUserRecentsLocked(userId);
@@ -789,7 +799,7 @@ class RecentTasks { 
            if (i == 0

                    || withExcluded

                    || (tr.intent == null)

                    || ((tr.intent.getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                    || ((tr.intent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                    == 0)) {

                if (!getTasksAllowed) {

                    // If the caller doesn't have the GET_TASKS permission, then only
@@ -826,7 +836,7 @@ class RecentTasks { 
                res.add(rti);

            }

        }

        return new ParceledListSlice<>(res);

        return res;

    }



    /**
@@ -1158,9 +1168,8 @@ class RecentTasks { 
            case ACTIVITY_TYPE_ASSISTANT:

                // Ignore assistant that chose to be excluded from Recents, even if it's a top

                // task.

                if ((task.getBaseIntent().getFlags()

                        & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                        == Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) {

                if ((task.getBaseIntent().getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                        == FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) {

                    return false;

                }

        }
@@ -1192,8 +1201,8 @@ class RecentTasks { 
    private boolean isInVisibleRange(TaskRecord task, int numVisibleTasks) {

        // Keep the last most task even if it is excluded from recents

        final boolean isExcludeFromRecents =

                (task.getBaseIntent().getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                        == Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

                (task.getBaseIntent().getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                        == FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

        if (isExcludeFromRecents) {

            if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "\texcludeFromRecents=true");

            return numVisibleTasks == 1;
@@ -1511,6 +1520,7 @@ class RecentTasks { 
            return;

        }



        // Dump raw recent task list

        boolean printedAnything = false;

        boolean printedHeader = false;

        final int size = mTasks.size();
@@ -1533,6 +1543,30 @@ class RecentTasks { 
            }

        }



        // Dump visible recent task list

        if (mHasVisibleRecentTasks) {

            // Reset the header flag for the next block

            printedHeader = false;

            ArrayList<ActivityManager.RecentTaskInfo> tasks = getRecentTasksImpl(Integer.MAX_VALUE,

                    0, true /* getTasksAllowed */, false /* getDetailedTasks */,

                    mService.getCurrentUserId(), SYSTEM_UID);

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

                final ActivityManager.RecentTaskInfo taskInfo = tasks.get(i);

                if (!printedHeader) {

                    if (printedAnything) {

                        // Separate from the last block if it printed

                        pw.println();

                    }

                    pw.println("  Visible recent tasks (most recent first):");

                    printedHeader = true;

                    printedAnything = true;

                }



                pw.print("  * RecentTaskInfo #"); pw.print(i); pw.print(": ");

                taskInfo.dump(pw, "    ");

            }

        }



        if (!printedAnything) {

            pw.println("  (nothing)");

        }