summaryrefslogtreecommitdiffstats
path: root/media/java/android
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-11-08 20:14:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-08 20:14:19 -0800
commit9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b (patch)
treeb094c7b2dbaa9aac0b49de5f7678da024054d1c5 /media/java/android
parent8bd41ac175f8e254d67d31cf020932e4f02d00c5 (diff)
parent1b2efbca7120cf799d1242d277af354df7b0a9bb (diff)
downloadframeworks_base-9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b.zip
frameworks_base-9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b.tar.gz
frameworks_base-9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b.tar.bz2
am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb': Update a comment about when setOrientationHint() should be called
Diffstat (limited to 'media/java/android')
-rw-r--r--media/java/android/media/MediaRecorder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index c102de4..ecabae8 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -286,7 +286,7 @@ public class MediaRecorder
/**
* Sets the orientation hint for output video playback.
- * This method should be called before start(). This method will not
+ * This method should be called before prepare(). This method will not
* trigger the source video frame to rotate during video recording, but to
* add a composition matrix containing the rotation angle in the output
* video if the output format is OutputFormat.THREE_GPP or