summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-06-12 23:34:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-12 23:34:51 +0000
commit8491d2dea90bf462b09befb604138a77d746f94a (patch)
tree84eede5efa8b8711f5c18c1867fa34a0d088f006 /core/java/android/hardware
parentcd9d7b7b076ff28bef5403b97754ae2853db17ee (diff)
parent68e4fc8ca9b923bc6d053589329eab8509d625ab (diff)
downloadframeworks_base-8491d2dea90bf462b09befb604138a77d746f94a.zip
frameworks_base-8491d2dea90bf462b09befb604138a77d746f94a.tar.gz
frameworks_base-8491d2dea90bf462b09befb604138a77d746f94a.tar.bz2
Merge "Fix rounding width." into mnc-dev
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
index cc95c0e..2fb3203 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
@@ -85,7 +85,7 @@ public class LegacyCameraDevice implements AutoCloseable {
private static final int GRALLOC_USAGE_HW_RENDER = 0x00000200;
private static final int GRALLOC_USAGE_HW_VIDEO_ENCODER = 0x00010000;
- public static final int MAX_DIMEN_FOR_ROUNDING = 1080; // maximum allowed width for rounding
+ public static final int MAX_DIMEN_FOR_ROUNDING = 1920; // maximum allowed width for rounding
// Keep up to date with values in system/core/include/system/window.h
public static final int NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW = 1;