diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-23 13:33:21 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:25 -0700 |
| commit | 191148e04511ac2dd9679e42b20ed03de8d23f28 (patch) | |
| tree | 0d05dd30d4b0639fcb531080ce4a4390df62524d /src | |
| parent | 39e6bdf4494b1ec476bd54e45bc261b6b4ee8b3a (diff) | |
| download | android_packages_apps_Snap-191148e04511ac2dd9679e42b20ed03de8d23f28.tar.gz android_packages_apps_Snap-191148e04511ac2dd9679e42b20ed03de8d23f28.tar.bz2 android_packages_apps_Snap-191148e04511ac2dd9679e42b20ed03de8d23f28.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')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index ac9ce27cd..65e2f56b0 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1264,8 +1264,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( |