Merge "Avoid using String.format in MediaRecorder" (996de2dd) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaRecorder.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ public class MediaRecorder
		degrees != 270) {
		throw new IllegalArgumentException("Unsupported angle: " + degrees);
		}
		setParameter(String.format("video-param-rotation-angle-degrees=%d", degrees));
		setParameter("video-param-rotation-angle-degrees=" + degrees);
		}

		/**
		@@ -425,7 +425,7 @@ public class MediaRecorder
		if (samplingRate <= 0) {
		throw new IllegalArgumentException("Audio sampling rate is not positive");
		}
		setParameter(String.format("audio-param-sampling-rate=%d", samplingRate));
		setParameter("audio-param-sampling-rate=" + samplingRate);
		}

		/**
		@@ -440,7 +440,7 @@ public class MediaRecorder
		if (numChannels <= 0) {
		throw new IllegalArgumentException("Number of channels is not positive");
		}
		setParameter(String.format("audio-param-number-of-channels=%d", numChannels));
		setParameter("audio-param-number-of-channels=" + numChannels);
		}

		/**
		@@ -456,7 +456,7 @@ public class MediaRecorder
		if (bitRate <= 0) {
		throw new IllegalArgumentException("Audio encoding bit rate is not positive");
		}
		setParameter(String.format("audio-param-encoding-bitrate=%d", bitRate));
		setParameter("audio-param-encoding-bitrate=" + bitRate);
		}

		/**
		@@ -472,7 +472,7 @@ public class MediaRecorder
		if (bitRate <= 0) {
		throw new IllegalArgumentException("Video encoding bit rate is not positive");
		}
		setParameter(String.format("video-param-encoding-bitrate=%d", bitRate));
		setParameter("video-param-encoding-bitrate=" + bitRate);
		}

		/**