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

Commit d24a97ab authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Update AudioFormat setChannelMask comment"" into main am: 5908942b am: 713b52e4 am: dd228321 am: f09d2cfa

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



Change-Id: I33f02f37e2b344cb030c920a98ec87e922b0de88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72ccd201 f09d2cfa

media/java/android/media/AudioFormat.java

+1 −2
Original line number Diff line number Diff line
@@ -1284,8 +1284,7 @@ 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 {@link AudioSystem#OUT_CHANNEL_COUNT_MAX} channel positions may be

         *    used;

         *    <br> (1) at most eight 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