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

Commit a6b84001 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aea am:... 

Merge "Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aea am: 61764563" into rvc-d1-dev-plus-aosp
parents aaa58fd8 089a1435

media/java/android/media/AudioDeviceInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -448,8 +448,7 @@ public final class AudioDeviceInfo { 
     * Returns an array of supported encapsulation modes for the device.

     *

     * The array can include any of the {@code AudioTrack} encapsulation modes,

     * e.g. {@link AudioTrack#ENCAPSULATION_MODE_NONE},

     * or {@link AudioTrack#ENCAPSULATION_MODE_ELEMENTARY_STREAM}.

     * e.g. {@link AudioTrack#ENCAPSULATION_MODE_ELEMENTARY_STREAM}.

     *

     * @return An array of supported encapsulation modes for the device.  This

     *     may be an empty array if no encapsulation modes are supported.

media/java/android/media/AudioTrack.java

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ public class AudioTrack extends PlayerBase 
    /**

     * Encapsulation metadata type for framework tuner information.

     *

     * TODO(b/147778408) Link: Fill in Tuner API info.

     * Refer to the Android Media TV Tuner API for details.

     */

    public static final int ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER = 1;