summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2016-01-19 18:46:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-01-19 18:46:09 +0000
commit11ca2874d29e75f82fa1bfefc530697b02b801fb (patch)
tree1f313e9241117fe81f65fd6db73f22e7e770b4a8
parent465eefb9f31928157158a0f30319d1d95a21a567 (diff)
parent26d2fdbba3dab2b46db3c68514cad6f428b88406 (diff)
Merge "Fix AudioAttributes.Builder.setFlags() javadoc"
-rw-r--r--media/java/android/media/AudioAttributes.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index 606447b5e45f..efae628f9e53 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -442,7 +442,8 @@ public final class AudioAttributes implements Parcelable {
/**
* Sets the combination of flags.
- * @param flags the {@link AudioAttributes#FLAG_AUDIBILITY_ENFORCED} flag.
+ * @param flags a combination of {@link AudioAttributes#FLAG_AUDIBILITY_ENFORCED},
+ * {@link AudioAttributes#FLAG_HW_AV_SYNC}.
* @return the same Builder instance.
*/
public Builder setFlags(int flags) {