From 1e4e128c0d3c330cb241211f0722afedcb44a58f Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Mon, 23 Dec 2013 13:33:21 -0800 Subject: camera: Check if video sizes are available * Some drivers don't report video sizes and we should avoid using fine resolution lookup, otherwise a crash results. Change-Id: I8010e66d1a3a5e6f8a505ff3b50146cd24fc2b9c --- src/com/android/camera/CameraSettings.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index db3bf274c..f423a8dcf 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1151,8 +1151,9 @@ public class CameraSettings { private static ArrayList getSupportedVideoQuality(int cameraId,Parameters parameters) { ArrayList supported = new ArrayList(); // Check for supported quality - if (ApiHelper.HAS_FINE_RESOLUTION_QUALITY_LEVELS) { - getFineResolutionQuality(supported,cameraId,parameters); + if (ApiHelper.HAS_FINE_RESOLUTION_QUALITY_LEVELS && + parameters.getSupportedVideoSizes() != null) { + getFineResolutionQuality(supported,cameraId,parameters); } else { supported.add(Integer.toString(CamcorderProfile.QUALITY_HIGH)); CamcorderProfile high = CamcorderProfile.get( -- cgit v1.2.3