diff options
| author | Ethan Chen <intervigil@gmail.com> | 2016-04-28 10:18:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-02 00:00:42 -0700 |
| commit | a788cdda0fd29d9c0b672ce1a7ae839fdd4aa4d3 (patch) | |
| tree | d3a029d90090e49445a54d195987618734691fed | |
| parent | 35cf43e34c230f2a4cff1d147685c8da026d2b1f (diff) | |
| download | android_packages_apps_Snap-a788cdda0fd29d9c0b672ce1a7ae839fdd4aa4d3.tar.gz android_packages_apps_Snap-a788cdda0fd29d9c0b672ce1a7ae839fdd4aa4d3.tar.bz2 android_packages_apps_Snap-a788cdda0fd29d9c0b672ce1a7ae839fdd4aa4d3.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
| -rw-r--r-- | 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 d48557d0c..c2b5fd727 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3490,8 +3490,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); |