diff options
| author | Ethan Chen <intervigil@gmail.com> | 2016-04-28 10:18:13 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:51 -0700 |
| commit | 38d93266430fd0634a496c58396ce5a8fddb7e05 (patch) | |
| tree | e7f0dfd380c8fe04ca4a777a8719b4801210ef0a /src/com | |
| parent | 32018b49ce4caf794b46ed07d66df24015cbdeb3 (diff) | |
| download | android_packages_apps_Snap-38d93266430fd0634a496c58396ce5a8fddb7e05.tar.gz android_packages_apps_Snap-38d93266430fd0634a496c58396ce5a8fddb7e05.tar.bz2 android_packages_apps_Snap-38d93266430fd0634a496c58396ce5a8fddb7e05.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/com')
| -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); |