Merge "Fix rounding width." into mnc-dev

diff --cc core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
index cc95c0e,b2c0f2d..2fb3203
--- 1/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
--- 2/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
@@@ -85,11 -85,8 +85,11 @@@ public class LegacyCameraDevice impleme
      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;
 +
      private CaptureResultExtras getExtrasFromRequest(RequestHolder holder) {
          if (holder == null) {
              return new CaptureResultExtras(ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE,