Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: I372c962a1ff0f3f9e4972998452789cf0edb3fc3
This commit is contained in:
Andy Hung
2020-06-22 17:21:50 +00:00
committed by Automerger Merge Worker
parent cd463e4191 72998aeaf7
commit 98ef1743b4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/AudioDeviceInfo.java
View File

@@ -448,8 +448,7 @@ public final class AudioDeviceInfo {
* Returns an array of supported encapsulation modes for the device. * Returns an array of supported encapsulation modes for the device.
* *
* The array can include any of the {@code AudioTrack} encapsulation modes, * The array can include any of the {@code AudioTrack} encapsulation modes,
* e.g. {@link AudioTrack#ENCAPSULATION_MODE_NONE}, * e.g. {@link AudioTrack#ENCAPSULATION_MODE_ELEMENTARY_STREAM}.
* or {@link AudioTrack#ENCAPSULATION_MODE_ELEMENTARY_STREAM}.
* *
* @return An array of supported encapsulation modes for the device. This * @return An array of supported encapsulation modes for the device. This
* may be an empty array if no encapsulation modes are supported. * may be an empty array if no encapsulation modes are supported.

2
media/java/android/media/AudioTrack.java
View File

@@ -280,7 +280,7 @@ public class AudioTrack extends PlayerBase
/** /**
* Encapsulation metadata type for framework tuner information. * 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; public static final int ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER = 1;