Unhide AudioTimestamp and getTimestamp

Change-Id: I56687f42f83c4be7dc3fd1baa81a13e71113f22e

diff --git a/api/current.txt b/api/current.txt
index 4e17144..7a00fb9 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -12139,6 +12139,12 @@ package android.media {
     method public abstract void onPeriodicNotification(android.media.AudioRecord);
   }
 
+  public final class AudioTimestamp {
+    ctor public AudioTimestamp();
+    field public long framePosition;
+    field public long nanoTime;
+  }
+
   public class AudioTrack {
     ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
     ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
@@ -12161,6 +12167,7 @@ package android.media {
     method public int getSampleRate();
     method public int getState();
     method public int getStreamType();
+    method public android.media.AudioTimestamp getTimestamp(android.media.AudioTimestamp);
     method public void pause() throws java.lang.IllegalStateException;
     method public void play() throws java.lang.IllegalStateException;
     method public void release();

diff --git a/media/java/android/media/AudioTimestamp.java b/media/java/android/media/AudioTimestamp.java
index 437a0c6..965ba85 100644 (file)
--- a/media/java/android/media/AudioTimestamp.java
+++ b/media/java/android/media/AudioTimestamp.java
@@ -26,9 +26,6 @@ package android.media;
  * is available to the system, but cannot account for any delay unknown to the implementation.
  *
  * @see AudioTrack#getTimestamp
- * @see AudioTrack.TimestampListener
- *
- * @hide
  */
 public final class AudioTimestamp
 {

diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 88539f2..788257d 100644 (file)
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -735,8 +735,7 @@ public class AudioTrack
    /**
     * Poll for a timestamp on demand.
     *
-    * Use if {@link TimestampListener} is not delivered often enough for your needs,
-    * or if you need to get the most recent timestamp outside of the event callback handler.
+    * Use if you need to get the most recent timestamp outside of the event callback handler.
     * Calling this method too often may be inefficient;
     * if you need a high-resolution mapping between frame position and presentation time,
     * consider implementing that at application level, based on low-resolution timestamps.
@@ -756,8 +755,6 @@ public class AudioTrack
     *         with the estimated time when that frame was presented or is committed to
     *         be presented.
     *         In the case that no timestamp is available, any supplied instance is left unaltered.
-    *
-    * @hide
     */
     public AudioTimestamp getTimestamp(AudioTimestamp timestamp)
     {