diff options
author | Dirk Dougherty <> | 2009-04-16 13:33:16 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-16 13:33:16 -0700 |
commit | 610cb2df9da25527a8b651cd0fdf76466463ae98 (patch) | |
tree | 31a5763fb87e704ded74ed1e2ddd9a0a9930b6c0 /docs/html/guide/topics/media | |
parent | afa2add8ba138cae8647fa5b0b264fd29193d353 (diff) | |
download | frameworks_base-610cb2df9da25527a8b651cd0fdf76466463ae98.zip frameworks_base-610cb2df9da25527a8b651cd0fdf76466463ae98.tar.gz frameworks_base-610cb2df9da25527a8b651cd0fdf76466463ae98.tar.bz2 |
AI 146601: Update media formats appendix for cupcake
BUG=1792195
Automated import of CL 146601
Diffstat (limited to 'docs/html/guide/topics/media')
-rw-r--r-- | docs/html/guide/topics/media/index.jd | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd index ba6d89f..4541024 100644 --- a/docs/html/guide/topics/media/index.jd +++ b/docs/html/guide/topics/media/index.jd @@ -44,14 +44,13 @@ can play audio or video from media files stored in the application's resources arriving over a network connection. To play audio or video from your application, use the {@link android.media.MediaPlayer} class.</p> -<p>The platform also lets you record audio, where supported by the mobile device -hardware. Recording of video is not currently supported, but is planned for a -future release. To record audio, use the -{@link android.media.MediaRecorder} class. Note that the emulator doesn't have -hardware to capture audio, but actual mobile devices are likely to provide these -capabilities that you can access through MediaRecorder. </p> - -<p>For a list of the media formats for which Android offers built-in support, +<p>The platform also lets you record audio and video, where supported by the +mobile device hardware. To record audio or video, use the {@link +android.media.MediaRecorder} class. Note that the emulator doesn't have hardware +to capture audio or video, but actual mobile devices are likely to provide these +capabilities, accessible through the MediaRecorder class. </p> + +<p>For a list of media formats for which Android offers built-in support, see the <a href="{@docRoot}guide/appendix/media-formats.html">Android Media Formats</a> appendix. </p> |