Cleanup dumpstate for CTS tests
Change-Id: Iefd7f2863b1a2d8974d0cd1c27b1d3b2d3ffbe8e
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 13099dc..243c4a5 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -928,7 +928,7 @@
+ " 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 @@
}
}
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
diff --git a/services/core/java/com/android/server/wm/PinnedStackController.java b/services/core/java/com/android/server/wm/PinnedStackController.java
index a488d52..21b0427 100644
--- a/services/core/java/com/android/server/wm/PinnedStackController.java
+++ b/services/core/java/com/android/server/wm/PinnedStackController.java
@@ -18,6 +18,7 @@
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;
@@ -79,6 +80,7 @@
// 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.
@@ -315,6 +317,11 @@
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);
}
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 66b2cbc..0abcd9f 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8088,7 +8088,6 @@
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 @@
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)) {