am 533587d8: am 9f4a392e: Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev

* commit '533587d805892572a837098ec196d1710a5187bb':
  Unhide AudioTimestamp and getTimestamp

1 files changed, 7 insertions, 0 deletions

diff --git a/api/current.txt b/api/current.txt
index 2d7f05e..e2b4652 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12172,6 +12172,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;
@@ -12194,6 +12200,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();