am 26ad1e7: am 03d16e1: Merge "Make setCaptureRate locale safe"

* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
  Make setCaptureRate locale safe

Author: Jean-Baptiste Queru

media/java/android/media/MediaRecorder.java

@@ -351,12 +351,11 @@ public void setProfile(CamcorderProfile profile) {
      */
     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);
     }
 
     /**