summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-03-18 21:15:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-18 21:15:32 +0000
commit3ae9ff30f70fa22ed65a7379ec6c85d48db3f283 (patch)
tree3dfbdb91de5e993a97f66a4750b65c977d124dc0
parentd13ac3c727950ef4ce4a32d50ab83a12d2f3ea78 (diff)
parent72e6a4a250fba2c19b6692b39201f79074095e4d (diff)
Merge "AudioTrack: fix javadoc in setOffloadDelayPadding"
-rw-r--r--media/java/android/media/AudioTrack.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 09cfa956a7a0..41e059bba92d 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -1014,9 +1014,9 @@ public class AudioTrack extends PlayerBase
* frame indicates the number of samples per channel, e.g. 100 frames for a stereo compressed
* stream corresponds to 200 decoded interleaved PCM samples.
* @param delayInFrames number of frames to be ignored at the beginning of the stream. A value
- * of 0 indicates no padding is to be applied.
- * @param paddingInFrames number of frames to be ignored at the end of the stream. A value of 0
* of 0 indicates no delay is to be applied.
+ * @param paddingInFrames number of frames to be ignored at the end of the stream. A value of 0
+ * of 0 indicates no padding is to be applied.
*/
public void setOffloadDelayPadding(@IntRange(from = 0) int delayInFrames,
@IntRange(from = 0) int paddingInFrames) {