diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-07 21:36:55 +0100 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-07 13:26:16 -0800 |
| commit | 06ac71fabf96e0a6d6ef5b0a96f729b4a1c0e412 (patch) | |
| tree | c1049274ba434100179991336af011e43dbfb7a6 /src/com/android/camera/VideoModule.java | |
| parent | 04568574c6a24efcf8d15426d133979df557ea2e (diff) | |
| download | android_packages_apps_Snap-06ac71fabf96e0a6d6ef5b0a96f729b4a1c0e412.tar.gz android_packages_apps_Snap-06ac71fabf96e0a6d6ef5b0a96f729b4a1c0e412.tar.bz2 android_packages_apps_Snap-06ac71fabf96e0a6d6ef5b0a96f729b4a1c0e412.zip | |
Snap: add fallback for invalid video qualities
Might happen when updating from previous versions of Snap
Change-Id: Ib52a2daff5a45c33ede1effd7cb7bed2fe61e5cc
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 9c3355cb6..70cfba011 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -865,6 +865,13 @@ public class VideoModule implements CameraModule, } mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality).apply(); } + + // videoQuality must be at least 3 chars long (1x1) and contain the letter "x" + if (videoQuality.length() < 3 && !videoQuality.contains("x")) { + Log.e(TAG, "Invalid video quality " + videoQuality + ". Fallback to 352x288."); + videoQuality = "352x288"; + } + int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality); // Set video quality. |