Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfee72d3 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Update AudioFormat setChannelMask comment" into main am: 59326477 am:... 

Merge "Update AudioFormat setChannelMask comment" into main am: 59326477 am: 84076004 am: 435b2077

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2749533



Change-Id: I0f1345ce887e01bd89ac25bb5ac889d44a58f5c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64577a4a 435b2077

media/java/android/media/AudioFormat.java

+2 −1
Original line number Diff line number Diff line
@@ -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