summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorJeff Smith <whydoubt@yahoo.com>2012-07-25 10:56:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-25 10:56:03 -0700
commit71930dd77e4dc6f6be5c648019d2ab0da5f0584c (patch)
tree054d7126dbfef0a1ea6585a8bc258229dd65fd08 /media/java
parent7c00f81606de1880c3f28e54cea064c3b90da3e7 (diff)
parenta45746efadd11bb7dfab026fb3c81a25fae74ca4 (diff)
downloadframeworks_base-71930dd77e4dc6f6be5c648019d2ab0da5f0584c.zip
frameworks_base-71930dd77e4dc6f6be5c648019d2ab0da5f0584c.tar.gz
frameworks_base-71930dd77e4dc6f6be5c648019d2ab0da5f0584c.tar.bz2
am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
* commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4': Fix several cases of broken droiddoc syntax external issue 35214
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaExtractor.java2
-rw-r--r--media/java/android/media/MediaPlayer.java2
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 870a4a9..cd25865 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;