am b7df3a71: Merge "Make display info accessible from hidden api." into jb-mr1-dev

* commit 'b7df3a714f43ee6fe0861e8bc81c4b15082b751e':
  Make display info accessible from hidden api.

core/java/android/view/Display.java

@@ -100,6 +100,19 @@ public final class Display {
         return mDisplayId;
     }
 
+    /**
+     * Gets a full copy of the display information.
+     *
+     * @param outDisplayInfo The object to receive the copy of the display information.
+     * @hide
+     */
+    public void getDisplayInfo(DisplayInfo outDisplayInfo) {
+        synchronized (this) {
+            updateDisplayInfoLocked();
+            outDisplayInfo.copyFrom(mDisplayInfo);
+        }
+    }
+
     /**
      * Gets the size of the display, in pixels.
      * <p>