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

Commit dedc5a5a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding task org controller dump" into rvc-dev am: 422e9db9 

Change-Id: Id8b8fa1338be340a34a63d607f368de5daf22d0b
parents e8c7af4d 422e9db9

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

+4 −4
Original line number Diff line number Diff line
@@ -2009,6 +2009,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
        pw.println();

        pw.println("ActivityStackSupervisor state:");

        mRootWindowContainer.dump(pw, prefix);

        getKeyguardController().dump(pw, prefix);

        mService.getLockTaskController().dump(pw, prefix);

        pw.print(prefix);

        pw.println("mCurTaskIdForUser=" + mCurTaskIdForUser);

        pw.println(prefix + "mUserStackInFront=" + mRootWindowContainer.mUserStackInFront);
@@ -2019,10 +2021,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
            }

        }

        pw.print(prefix); pw.print("isHomeRecentsComponent=");

        pw.print(mRecentTasks.isRecentsComponentHomeActivity(mRootWindowContainer.mCurrentUser));



        getKeyguardController().dump(pw, prefix);

        mService.getLockTaskController().dump(pw, prefix);

        pw.println(mRecentTasks.isRecentsComponentHomeActivity(mRootWindowContainer.mCurrentUser));

        pw.println();

    }



    static boolean printThisActivity(PrintWriter pw, ActivityRecord activity, String dumpPackage,

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

+1 −0
Original line number Diff line number Diff line
@@ -4978,6 +4978,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            }

            printedAnything = true;

            mStackSupervisor.dump(pw, "  ");

            mTaskOrganizerController.dump(pw, "  ");

        }



        if (!printedAnything) {

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

+1 −0
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ class KeyguardController { 
        dumpDisplayStates(pw, prefix);

        pw.println(prefix + "  mDismissalRequested=" + mDismissalRequested);

        pw.println(prefix + "  mVisibilityTransactionDepth=" + mVisibilityTransactionDepth);

        pw.println();

    }



    void dumpDebug(ProtoOutputStream proto, long fieldId) {

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

+2 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ public class LockTaskController { 
    }



    public void dump(PrintWriter pw, String prefix) {

        pw.println(prefix + "LockTaskController");

        pw.println(prefix + "LockTaskController:");

        prefix = prefix + "  ";

        pw.println(prefix + "mLockTaskModeState=" + lockTaskModeToString());

        pw.println(prefix + "mLockTaskModeTasks=");
@@ -929,6 +929,7 @@ public class LockTaskController { 
            pw.println(prefix + "  u" + mLockTaskPackages.keyAt(i)

                    + ":" + Arrays.toString(mLockTaskPackages.valueAt(i)));

        }

        pw.println();

    }



    private String lockTaskModeToString() {

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

+1 −0
Original line number Diff line number Diff line
@@ -3496,6 +3496,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            final DisplayContent display = getChildAt(i);

            display.dump(pw, prefix, true /* dumpAll */);

        }

        pw.println();

    }



    /**