summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shunkai Yao <yaoshunkai@google.com> 2023-09-14 03:19:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-14 03:19:16 +0000
commit435b207783ca28f8e52adc4fee4ca0c7ddc65bec (patch)
treefd3daef80c36df73a30666c885e5d4df50736ca0
parent834467bdcc1a799ece112553070593bbd4940455 (diff)
parent840760042d4385fe44b174e42db976eb50d2eac7 (diff)
Merge "Update AudioFormat setChannelMask comment" into main am: 5932647710 am: 840760042d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2749533 Change-Id: I3b3441e9915c460202df277f93c66e621522a1b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/java/android/media/AudioFormat.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java
index ceb3858eb0b3..a311296dd90c 100644
--- a/media/java/android/media/AudioFormat.java
+++ b/media/java/android/media/AudioFormat.java
@@ -1284,7 +1284,8 @@ public final class AudioFormat implements Parcelable {
* {@link AudioFormat#CHANNEL_OUT_SIDE_RIGHT}.
* <p> For a valid {@link AudioTrack} channel position mask,
* the following conditions apply:
- * <br> (1) at most eight channel positions may be used;
+ * <br> (1) at most {@link AudioSystem#OUT_CHANNEL_COUNT_MAX} channel positions may be
+ * used;
* <br> (2) right/left pairs should be matched.
* <p> For input or {@link AudioRecord}, the mask should be
* {@link AudioFormat#CHANNEL_IN_MONO} or