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

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

Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am:... 

Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am: 709f2a47 am: 63d05511 am: 2b8ba491 am: 62ed5ceb

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



Change-Id: I783bbb47b5fabbc7ee979b242f3be354cfce3d64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 983645e4 62ed5ceb

media/java/android/media/AudioFormat.java

+2 −4
Original line number Diff line number Diff line
@@ -1282,10 +1282,8 @@ public final class AudioFormat implements Parcelable { 
         *    {@link AudioFormat#CHANNEL_OUT_BACK_CENTER},

         *    {@link AudioFormat#CHANNEL_OUT_SIDE_LEFT},

         *    {@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> (2) right/left pairs should be matched.

         *    <p> For output or {@link AudioTrack}, channel position masks which do not contain

         *    matched left/right pairs are invalid.

         *    <p> For input or {@link AudioRecord}, the mask should be

         *    {@link AudioFormat#CHANNEL_IN_MONO} or

         *    {@link AudioFormat#CHANNEL_IN_STEREO}.  {@link AudioFormat#CHANNEL_IN_MONO} is