diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java
index 13a2db4..640044b 100644
--- a/core/java/android/hardware/display/DisplayManager.java
+++ b/core/java/android/hardware/display/DisplayManager.java
@@ -64,6 +64,7 @@
      * @param displayId The logical display id.
      * @param outInfo A structure to populate with the display info.
      * @return True if the logical display exists, false otherwise.
+     * @hide
      */
     public boolean getDisplayInfo(int displayId, DisplayInfo outInfo) {
         try {
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
index 2acccd3..2619dd8 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
@@ -70,17 +70,6 @@
         return mRotation;
     }
 
-    @Override
-    public void getDisplayInfo(int arg0, DisplayInfo arg1) throws RemoteException {
-        arg1.appWidth = mMetrics.widthPixels;
-        arg1.appHeight = mMetrics.heightPixels;
-        arg1.logicalWidth = mMetrics.widthPixels;
-        arg1.logicalHeight = mMetrics.heightPixels;
-        arg1.logicalDensity = mMetrics.density;
-        arg1.physicalXDpi = mMetrics.xdpi;
-        arg1.physicalYDpi = mMetrics.ydpi;
-    }
-
     // ---- unused implementation of IWindowManager ----
 
     @Override
