summaryrefslogtreecommitdiff
path: root/src/com/android/camera/util/CameraUtil.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-10-06 07:18:04 -0700
committerLinux Build Service Account <lnxbuild@localhost>2018-10-06 07:18:04 -0700
commit4feab910ab9efada7a911a8638856c55ee09b9ca (patch)
tree1fd24a47ee24950afa47b60839ad044b33a9bc06 /src/com/android/camera/util/CameraUtil.java
parentc6cde759cd7d38d28b3b2e75a36161b041cd6e9c (diff)
parent9530e578cb7c92f8abd1dbf921113387bfb9b047 (diff)
Merge 9530e578cb7c92f8abd1dbf921113387bfb9b047 on remote branchHEADp9.0
Change-Id: I8cb5d9eee763cfc5df1a95b1148cd054ffda62eb
Diffstat (limited to 'src/com/android/camera/util/CameraUtil.java')
-rwxr-xr-xsrc/com/android/camera/util/CameraUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index b9e5baf28..638874fc7 100755
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -577,7 +577,7 @@ public class CameraUtil {
for (int i = 0; i < sizes.length; i++) {
Point size = sizes[i];
double ratio = (double) size.x / size.y;
- if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
+ if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE || size.x > 1080) continue;
// Count sizes with height <= 1080p to mimic camera1 api behavior.
if (size.y > MAX_ASPECT_HEIGHT) continue;