summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-27 13:10:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-27 13:10:57 -0700
commitc77c6898b3e0fd057d1f9d8696f467d29bc2441f (patch)
tree569331aacf648824718ca238804890aa17d9950c /media/java
parentbe7ddb9f293076e0c14dc72ea498aced8742b5a9 (diff)
parent3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a (diff)
downloadframeworks_base-c77c6898b3e0fd057d1f9d8696f467d29bc2441f.zip
frameworks_base-c77c6898b3e0fd057d1f9d8696f467d29bc2441f.tar.gz
frameworks_base-c77c6898b3e0fd057d1f9d8696f467d29bc2441f.tar.bz2
am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
* commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a': Make setCaptureRate locale safe
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaRecorder.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index ca2df47..2d1be02 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);
}
/**