diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-27 11:29:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-27 11:29:29 -0700 |
| commit | 3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a (patch) | |
| tree | 8388fa038d441cd4b89e651a585308e26fa1187e /media/java | |
| parent | ba37d595f70d348987a9e60c56c071fdd319260f (diff) | |
| parent | 26ad1e7874f3151ec331e142fdcb8b3a22ddc26a (diff) | |
| download | frameworks_base-3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a.zip frameworks_base-3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a.tar.gz frameworks_base-3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a.tar.bz2 | |
am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
Make setCaptureRate locale safe
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 9af201d..613354f 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -351,12 +351,11 @@ public class MediaRecorder */ public void setCaptureRate(double fps) { // Make sure that time lapse is enabled when this method is called. - setParameter(String.format("time-lapse-enable=1")); + setParameter("time-lapse-enable=1"); double timeBetweenFrameCapture = 1 / fps; int timeBetweenFrameCaptureMs = (int) (1000 * timeBetweenFrameCapture); - setParameter(String.format("time-between-time-lapse-frame-capture=%d", - timeBetweenFrameCaptureMs)); + setParameter("time-between-time-lapse-frame-capture=" + timeBetweenFrameCaptureMs); } /** |