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

Commit 47994ccb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup dumpstate for CTS tests"

parents a49078e9 ad5d2846

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

+4 −4
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                    + " mLayoutNeeded=" + mLayoutNeeded);



        pw.println();

        pw.println("  Application tokens in top down Z order:");

        pw.println(prefix + "Application tokens in top down Z order:");

        for (int stackNdx = mTaskStackContainers.size() - 1; stackNdx >= 0; --stackNdx) {

            final TaskStack stack = mTaskStackContainers.get(stackNdx);

            stack.dump(prefix + "  ", pw);
@@ -947,11 +947,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            }

        }

        pw.println();

        mDimLayerController.dump(prefix + "  ", pw);

        mDimLayerController.dump(prefix, pw);

        pw.println();

        mDividerControllerLocked.dump(prefix + "  ", pw);

        mDividerControllerLocked.dump(prefix, pw);

        pw.println();

        mPinnedStackControllerLocked.dump(prefix + "  ", pw);

        mPinnedStackControllerLocked.dump(prefix, pw);



        if (mInputMethodAnimLayerAdjustment != 0) {

            pw.println(subPrefix

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

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.app.ActivityManager.StackId.PINNED_STACK_ID;

import static android.util.TypedValue.COMPLEX_UNIT_DIP;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
@@ -81,6 +82,7 @@ class PinnedStackController { 
    // Temp vars for calculation

    private final DisplayMetrics mTmpMetrics = new DisplayMetrics();

    private final Rect mTmpInsets = new Rect();

    private final Rect mTmpRect = new Rect();



    /**

     * The callback object passed to listeners for them to notify the controller of state changes.
@@ -298,6 +300,11 @@ class PinnedStackController { 


    void dump(String prefix, PrintWriter pw) {

        pw.println(prefix + "PinnedStackController");

        pw.print(prefix + "  defaultBounds="); getDefaultBounds().printShortString(pw);

        pw.println();

        mService.getStackBounds(PINNED_STACK_ID, mTmpRect);

        pw.print(prefix + "  movementBounds="); getMovementBounds(mTmpRect).printShortString(pw);

        pw.println();

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

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

    }

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

+0 −13
Original line number Diff line number Diff line
@@ -8088,7 +8088,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                pw.println("    a[animator]: animator state");

                pw.println("    s[essions]: active sessions");

                pw.println("    surfaces: active surfaces (debugging enabled only)");

                pw.println("    pip: PIP state");

                pw.println("    d[isplays]: active display contents");

                pw.println("    t[okens]: token list");

                pw.println("    w[indows]: window list");
@@ -8161,18 +8160,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                    pw.println(output.toString());

                }

                return;

            } else if ("pip".equals(cmd)) {

                synchronized(mWindowMap) {

                    pw.print("defaultBounds=");

                    getPictureInPictureDefaultBounds(DEFAULT_DISPLAY).printShortString(pw);

                    pw.println();

                    pw.print("movementBounds=");

                    getPictureInPictureMovementBounds(DEFAULT_DISPLAY).printShortString(pw);

                    pw.println();

                    getDefaultDisplayContentLocked().getPinnedStackController().dump("", pw);

                    pw.println();

                }

                return;

            } else {

                // Dumping a single name?

                if (!dumpWindows(pw, cmd, args, opti, dumpAll)) {