diff options
| author | Jeff Smith <whydoubt@yahoo.com> | 2012-07-25 15:05:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-25 15:05:23 -0700 |
| commit | ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4 (patch) | |
| tree | 30361d5e73963eaea11100a01fbc7f6e69daae90 /media/java | |
| parent | 75bea2e8d35044233ba892bedf102ed08406d653 (diff) | |
| parent | 71930dd77e4dc6f6be5c648019d2ab0da5f0584c (diff) | |
| download | frameworks_base-ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4.zip frameworks_base-ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4.tar.gz frameworks_base-ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4.tar.bz2 | |
am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
Fix several cases of broken droiddoc syntax external issue 35214
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaExtractor.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 9f10cb0..687d3a5 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -295,7 +295,7 @@ final public class MediaExtractor { * Returns true iff we are caching data and the cache has reached the * end of the data stream (for now, a future seek may of course restart * the fetching of data). - * This API only returns a meaningful result if {link #getCachedDuration} + * This API only returns a meaningful result if {@link #getCachedDuration} * indicates the presence of a cache, i.e. does NOT return -1. */ public native boolean hasCacheReachedEndOfStream(); diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index a25d934..7693e80 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -706,7 +706,7 @@ public class MediaPlayer * surface rendering area. When the surface has the same aspect ratio * as the content, the aspect ratio of the content is maintained; * otherwise, the aspect ratio of the content is not maintained when video - * is being rendered. Unlike {@ #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}, + * is being rendered. Unlike {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}, * there is no content cropping with this video scaling mode. */ public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; |