summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shunkai Yao <yaoshunkai@google.com> 2023-09-14 04:10:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-14 04:10:10 +0000
commitcfee72d3290f8dcf78c76714cac85228afb009a0 (patch)
tree6fc1ef3fc1c8f9f0b482f0c06e1f10ccbcf77951
parent64577a4ac14f53c5b4548a10ba9b922eb857161c (diff)
parent435b207783ca28f8e52adc4fee4ca0c7ddc65bec (diff)
Merge "Update AudioFormat setChannelMask comment" into main am: 5932647710 am: 840760042d am: 435b207783
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2749533 Change-Id: I0f1345ce887e01bd89ac25bb5ac889d44a58f5c0 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