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

Commit ef408455 authored by Becky Siegel's avatar Becky Siegel Committed by Automerger Merge Worker
Browse files

Merge "Fix common typo" into main am: 3de3b3f9 

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



Change-Id: I61d1556f6ad108db36cd10ec5b5c5ce9a5ac8d0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b5f891f 3de3b3f9

media/java/android/media/AudioDescriptor.java

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class AudioDescriptor implements Parcelable { 
     * When encapsulation is required, only playback with {@link android.media.AudioTrack} API is

     * supported. But playback with {@link android.media.MediaPlayer} is not.

     * When an encapsulation type is required, the {@link AudioFormat} encoding selected when

     * creating the {@link AudioTrack} must match the encapsulation type, e.g

     * creating the {@link AudioTrack} must match the encapsulation type, e.g.

     * AudioFormat#ENCODING_IEC61937 for AudioProfile.AUDIO_ENCAPSULATION_TYPE_IEC61937.

     *

     * @return an integer representing the encapsulation type

media/java/android/media/AudioManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3460,7 +3460,7 @@ public class AudioManager { 


    /* modes for setMode/getMode/setRoute/getRoute */

    /**

     * Audio harware modes.

     * Audio hardware modes.

     */

    /**

     * Invalid audio mode.