summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/util
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-10-31 20:40:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-31 20:40:46 +0000
commit6ff701f5c8744583a73588f301374ff7e683ff15 (patch)
treed11239a9f1d904a2eb9fb424b77d421adb908c8b /src/com/android/camera/util
parent761306fadfa94b538f43e8cf3463bf6d22814947 (diff)
parent2a74dfd414217d9a774e0bf95c5991daa5f53e4c (diff)
downloadandroid_packages_apps_Snap-6ff701f5c8744583a73588f301374ff7e683ff15.tar.gz
android_packages_apps_Snap-6ff701f5c8744583a73588f301374ff7e683ff15.tar.bz2
android_packages_apps_Snap-6ff701f5c8744583a73588f301374ff7e683ff15.zip
Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/util')
-rw-r--r--src/com/android/camera/util/CameraUtil.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index fa1d58150..cd8facc0d 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -831,7 +831,10 @@ public class CameraUtil {
* the right range.
*/
public static int[] getPhotoPreviewFpsRange(Parameters params) {
- List<int[]> frameRates = params.getSupportedPreviewFpsRange();
+ return getPhotoPreviewFpsRange(params.getSupportedPreviewFpsRange());
+ }
+
+ public static int[] getPhotoPreviewFpsRange(List<int[]> frameRates) {
if (frameRates.size() == 0) {
Log.e(TAG, "No suppoted frame rates returned!");
return null;