summaryrefslogtreecommitdiff
path: root/src/com/android/camera/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/util')
-rwxr-xr-xsrc/com/android/camera/util/CameraUtil.java2
-rwxr-xr-xsrc/com/android/camera/util/PersistUtil.java2
2 files changed, 2 insertions, 2 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;
diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java
index 9453ff803..a490cc751 100755
--- a/src/com/android/camera/util/PersistUtil.java
+++ b/src/com/android/camera/util/PersistUtil.java
@@ -76,7 +76,7 @@ public class PersistUtil {
SystemProperties.getInt("persist.sys.camera.sensor.align",
CAMERA_SENSOR_HORIZONTAL_ALIGNED);
private static final int CIRCULAR_BUFFER_SIZE_PERSIST =
- SystemProperties.getInt("persist.sys.camera.zsl.buffer.size", 5);
+ SystemProperties.getInt("persist.sys.camera.zsl.buffer.size", 3);
private static final int SAVE_TASK_MEMORY_LIMIT_IN_MB =
SystemProperties.getInt("persist.sys.camera.perf.memlimit", 60);
private static final boolean PERSIST_CAMERA_UI_AUTO_TEST_ENABLED =