commit c77c6898b3e0fd057d1f9d8696f467d29bc2441f
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 27 13:10:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 27 13:10:57 2012 -0700
tree 569331aacf648824718ca238804890aa17d9950c
parent be7ddb9f293076e0c14dc72ea498aced8742b5a9
parent 3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a

am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"

* commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a':
  Make setCaptureRate locale safe

media/java/android/media/MediaRecorder.java

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 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);
     }
 
     /**