summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-11 01:36:39 +0200
committerBruno Martins <bgcngm@gmail.com>2018-11-20 12:31:35 +0000
commit5c277d570772f099381213defc02d8a6a132896b (patch)
treeed64e0a5fc1b7b9e05f59cc6ef9f2102070bcd80 /src/com/android/camera/VideoModule.java
parent9f11a38c910cfdfd5f714e5f7adfadba1f662570 (diff)
downloadandroid_packages_apps_Snap-5c277d570772f099381213defc02d8a6a132896b.tar.gz
android_packages_apps_Snap-5c277d570772f099381213defc02d8a6a132896b.tar.bz2
android_packages_apps_Snap-5c277d570772f099381213defc02d8a6a132896b.zip
Snap: Fall back to default quality for invalid video qualities
Might happen when updating from previous versions of Snap Change-Id: I42d2037b4e32c7f5c88a60b5da1895dcb761d176
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r--src/com/android/camera/VideoModule.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 38be63964..a04dc3027 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -872,9 +872,8 @@ public class VideoModule implements CameraModule,
private void readVideoPreferences() {
// The preference stores values from ListPreference and is thus string type for all values.
// We need to convert it to int manually.
- String videoQuality = mPreferences.getString(CameraSettings.KEY_VIDEO_QUALITY,
- null);
- if (videoQuality == null) {
+ String videoQuality = mPreferences.getString(CameraSettings.KEY_VIDEO_QUALITY, null);
+ if (videoQuality == null || (videoQuality.length() < 3 && !videoQuality.contains("x"))) {
mParameters = mCameraDevice.getParameters();
String defaultQuality = mActivity.getResources().getString(
R.string.pref_video_quality_default);