diff options
author | Ethan Chen <intervigil@gmail.com> | 2016-04-28 10:18:13 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:49 +0200 |
commit | ec86f6ccb327fa7022a4210f99b1396ec1591a1c (patch) | |
tree | b9cfbb33f46b3a9bd838998e7e23f708c295214f /src | |
parent | 9296228b43c28cbee34b6efeb9dc5aa52ce86cb4 (diff) | |
download | android_packages_apps_Snap-ec86f6ccb327fa7022a4210f99b1396ec1591a1c.tar.gz android_packages_apps_Snap-ec86f6ccb327fa7022a4210f99b1396ec1591a1c.tar.bz2 android_packages_apps_Snap-ec86f6ccb327fa7022a4210f99b1396ec1591a1c.zip |
Snap: Only set preferred preview sizes if they are valid
* Check if a preferred photo preview size is valid before using it.
Change-Id: Ia9580b68b60df9784f657df16b317748ff40a696
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index b99a4640c..c15abbc07 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3875,8 +3875,12 @@ public class PhotoModule try { android.util.Size previewSize = android.util.Size.parseSize(previewSizeForPhoto); - optimalSize.width = previewSize.getWidth(); - optimalSize.height = previewSize.getHeight(); + for (Size s : sizes) { + if (s.width == previewSize.getWidth() && s.height == previewSize.getHeight()) { + optimalSize.width = previewSize.getWidth(); + optimalSize.height = previewSize.getHeight(); + } + } Log.v(TAG, "Preview resolution hardcoded to " + optimalSize.width + "x" + optimalSize.height); } catch (NumberFormatException e) { Log.e(TAG, "Invalid preview resolution: " + previewSizeForPhoto); |