summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2016-01-07 21:36:55 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:02:27 +0100
commitaf1ad5f305f842cf282075c55e19ec2754d2a18b (patch)
tree8305010ca6b8795eec2ddac7846ebc1a8a5d261b
parentae8ef453111d0050efda875959ce8090bb19925b (diff)
downloadandroid_packages_apps_Snap-af1ad5f305f842cf282075c55e19ec2754d2a18b.tar.gz
android_packages_apps_Snap-af1ad5f305f842cf282075c55e19ec2754d2a18b.tar.bz2
android_packages_apps_Snap-af1ad5f305f842cf282075c55e19ec2754d2a18b.zip
Snap: add fallback for invalid video qualities
Might happen when updating from previous versions of Snap Change-Id: Ib52a2daff5a45c33ede1effd7cb7bed2fe61e5cc
-rw-r--r--src/com/android/camera/VideoModule.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index b285ce2ce..195b40a6b 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -891,6 +891,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.