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

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

Merge "Revert "Update AudioFormat setChannelMask comment"" into main am: 5908942b 

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



Change-Id: I45594ccfaf8e37d84ebbb363410349d24964cd10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9105800 5908942b

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