summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-12-23 13:33:21 -0800
committerArne Coucheron <arco68@gmail.com>2018-01-26 00:51:09 +0100
commitc02e557b58cf40aa235d0449f55ea681e6bb3ec4 (patch)
tree4f62086e69346d93deba4345fd1bb73d76e8cc98 /src/com/android/camera/CameraSettings.java
parent8be9950f3245b2d9c617128616029da503770b27 (diff)
downloadandroid_packages_apps_Snap-c02e557b58cf40aa235d0449f55ea681e6bb3ec4.tar.gz
android_packages_apps_Snap-c02e557b58cf40aa235d0449f55ea681e6bb3ec4.tar.bz2
android_packages_apps_Snap-c02e557b58cf40aa235d0449f55ea681e6bb3ec4.zip
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
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 62ddc45e4..b3272c7b5 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -1364,8 +1364,9 @@ public class CameraSettings {
private static ArrayList<String> getSupportedVideoQuality(int cameraId,Parameters parameters) {
ArrayList<String> supported = new ArrayList<String>();
// 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(