diff options
| author | Andy McFadden <fadden@android.com> | 2014-06-19 14:23:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-18 22:47:18 +0000 |
| commit | 45b161d24d82ef1df3ff854a1d97db0c9bad187a (patch) | |
| tree | 66525dd25709aa1aef4fa883ffb60f544f33dd21 | |
| parent | aab72f3b0ab740e12b4a2576a99852081529feb5 (diff) | |
| parent | 77db7d09ff61ae4de5f75cd507d6e93cb2f4410a (diff) | |
| download | frameworks_base-45b161d24d82ef1df3ff854a1d97db0c9bad187a.zip frameworks_base-45b161d24d82ef1df3ff854a1d97db0c9bad187a.tar.gz frameworks_base-45b161d24d82ef1df3ff854a1d97db0c9bad187a.tar.bz2 | |
Merge "Make two Display methods public"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/Display.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 019de19..f6ccc67 100644 --- a/api/current.txt +++ b/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); diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 181f77e..76a6f52 100644 --- a/core/java/android/view/Display.java +++ b/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) { |