Improve display manager debugging.

Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39

diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 18eba81..6f8ca13 100644 (file)
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -382,5 +382,16 @@ public final class Display {
             mLastCachedAppSizeUpdate = now;
         }
     }
+
+    // For debugging purposes
+    @Override
+    public String toString() {
+        synchronized (this) {
+            updateDisplayInfoLocked();
+            mDisplayInfo.getAppMetrics(mTempMetrics, mCompatibilityInfo);
+            return "Display id " + mDisplayId + ": " + mDisplayInfo
+                    + ", " + mTempMetrics;
+        }
+    }
 }
 

diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index c65ce63..e38f245 100644 (file)
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -223,4 +223,17 @@ public final class DisplayInfo implements Parcelable {
             }
         }
     }
+
+    // For debugging purposes
+    @Override
+    public String toString() {
+        return "app " + appWidth + " x " + appHeight
+                + ", real " + logicalWidth + " x " + logicalHeight
+                + ", largest app " + largestNominalAppWidth + " x " + largestNominalAppHeight
+                + ", smallest app " + smallestNominalAppWidth + " x " + smallestNominalAppHeight
+                + ", " + refreshRate + " fps"
+                + ", rotation " + rotation
+                + ", density " + logicalDensityDpi
+                + ", " + physicalXDpi + " x " + physicalYDpi + " dpi";
+    }
 }

diff --git a/services/java/com/android/server/display/DisplayManagerService.java b/services/java/com/android/server/display/DisplayManagerService.java
index 7c0f8fd..2ebad1d 100644 (file)
--- a/services/java/com/android/server/display/DisplayManagerService.java
+++ b/services/java/com/android/server/display/DisplayManagerService.java
@@ -19,6 +19,7 @@ package com.android.server.display;
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.hardware.display.DisplayManager;
 import android.hardware.display.IDisplayManager;
 import android.os.Binder;
 import android.os.SystemProperties;
@@ -166,7 +167,10 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
                 pw.println("Adapter: " + adapter.getName());
             }
 
-            pw.println("Default display: " + mDefaultDisplayInfo);
+            pw.println("Default display info: " + mDefaultDisplayInfo);
         }
+
+        pw.println("Default display: "
+                + DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY));
     }
 }