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

Commit 7a1c9ba5 authored by Benjamin Franz's avatar Benjamin Franz
Browse files

Add new dumpsys command to dump the top resumed activity 

The new command is invoked via

> adb shell dumpsys activity top-resumed

This command is used by foldables app compat QA team to extract
information about the resizability of the currently resumed activityf.

Bug: 155111946
Test: adb shell dumpsys activity top-resumed
Change-Id: I50b93ecb5deebd2461109b9e19ee9ae42f8ce15f
parent 02151de4

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

+3 −1
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ import static com.android.server.wm.ActivityTaskManagerService.DUMP_LASTANR_TRAC 
import static com.android.server.wm.ActivityTaskManagerService.DUMP_RECENTS_CMD;

import static com.android.server.wm.ActivityTaskManagerService.DUMP_RECENTS_SHORT_CMD;

import static com.android.server.wm.ActivityTaskManagerService.DUMP_STARTER_CMD;

import static com.android.server.wm.ActivityTaskManagerService.DUMP_TOP_RESUMED_ACTIVITY;

import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE;

import static com.android.server.wm.ActivityTaskManagerService.relaunchReasonToString;










@@ -8648,7 +8649,8 @@ public class ActivityManagerService extends IActivityManager.Stub













            if (DUMP_ACTIVITIES_CMD.equals(cmd) || DUMP_ACTIVITIES_SHORT_CMD.equals(cmd)















                    || DUMP_LASTANR_CMD.equals(cmd) || DUMP_LASTANR_TRACES_CMD.equals(cmd)















                    || DUMP_STARTER_CMD.equals(cmd) || DUMP_CONTAINERS_CMD.equals(cmd)













                    || DUMP_RECENTS_CMD.equals(cmd) || DUMP_RECENTS_SHORT_CMD.equals(cmd)) {













                    || DUMP_RECENTS_CMD.equals(cmd) || DUMP_RECENTS_SHORT_CMD.equals(cmd)













                    || DUMP_TOP_RESUMED_ACTIVITY.equals(cmd)) {















                mAtmInternal.dump(















                        cmd, fd, pw, args, opti, true /* dumpAll */, dumpClient, dumpPackage);















            } else if ("binder-proxies".equals(cmd)) {

































services/core/java/com/android/server/wm/ActivityTaskManagerService.java



+11
−0




























Original line number
Diff line number
Diff line








@@ -317,6 +317,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













    public static final String DUMP_CONTAINERS_CMD = "containers";















    public static final String DUMP_RECENTS_CMD = "recents";















    public static final String DUMP_RECENTS_SHORT_CMD = "r";













    public static final String DUMP_TOP_RESUMED_ACTIVITY = "top-resumed";































    /** This activity is not being relaunched, or being relaunched for a non-resize reason. */















    public static final int RELAUNCH_REASON_NONE = 0;










@@ -3730,6 +3731,14 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













        }















    }





























    void dumpTopResumedActivityLocked(PrintWriter pw) {













        pw.println("ACTIVITY MANAGER TOP-RESUMED (dumpsys activity top-resumed)");













        ActivityRecord topRecord = mRootWindowContainer.getTopResumedActivity();













        if (topRecord != null) {













            topRecord.dump(pw, "", true);













        }













    }





























    void dumpActivitiesLocked(FileDescriptor fd, PrintWriter pw, String[] args,















            int opti, boolean dumpAll, boolean dumpClient, String dumpPackage) {















        dumpActivitiesLocked(fd, pw, args, opti, dumpAll, dumpClient, dumpPackage,










@@ -5869,6 +5878,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













                    if (getRecentTasks() != null) {















                        getRecentTasks().dump(pw, dumpAll, dumpPackage);















                    }













                } else if (DUMP_TOP_RESUMED_ACTIVITY.equals(cmd)) {













                    dumpTopResumedActivityLocked(pw);















                }















            }















        }