Merge "Make two Display methods public"

api/current.txt

@@ -31349,6 +31349,7 @@ package android.view {
   }
 
   public final class Display {
+    method public long getAppVsyncOffsetNanos();
     method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
     method public int getDisplayId();
     method public int getFlags();
@@ -31357,6 +31358,7 @@ package android.view {
     method public java.lang.String getName();
     method public deprecated int getOrientation();
     method public deprecated int getPixelFormat();
+    method public long getPresentationDeadlineNanos();
     method public void getRealMetrics(android.util.DisplayMetrics);
     method public void getRealSize(android.graphics.Point);
     method public void getRectSize(android.graphics.Rect);

core/java/android/view/Display.java

@@ -606,7 +606,6 @@ public final class Display {
      * <p>
      * Apps generally do not need to be aware of this.  It's only useful for fine-grained
      * A/V synchronization.
-     * @hide
      */
     public long getAppVsyncOffsetNanos() {
         synchronized (this) {
@@ -625,7 +624,6 @@ public final class Display {
      * {@link android.media.MediaCodec#releaseOutputBuffer(int, long)}.  Times are
      * expressed in nanoseconds, using the system monotonic clock
      * ({@link System#nanoTime}).
-     * @hide
      */
     public long getPresentationDeadlineNanos() {
         synchronized (this) {