diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-11 01:36:39 +0200 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:28 -0700 |
| commit | 95d7692d1997077a5d89b49ae2c634343de929f3 (patch) | |
| tree | d26d18b65b0347e339ee69fa257ed8d4fa176e25 /src/com | |
| parent | a640da814f123bb7589818b8f0f41f145165a3a5 (diff) | |
| download | android_packages_apps_Snap-95d7692d1997077a5d89b49ae2c634343de929f3.tar.gz android_packages_apps_Snap-95d7692d1997077a5d89b49ae2c634343de929f3.tar.bz2 android_packages_apps_Snap-95d7692d1997077a5d89b49ae2c634343de929f3.zip | |
Snap: Fall back to default quality instead of 352x288
* Not all devices support this resolution
Change-Id: I42d2037b4e32c7f5c88a60b5da1895dcb761d176
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 14225eadf..21dd832b9 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -939,9 +939,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); @@ -958,12 +957,6 @@ 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. |