diff options
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java index 7c6475dde814..72d2d81bff4c 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java @@ -399,8 +399,9 @@ public class LegacyRequestMapper { // jpeg.orientation { - int orientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION); - params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION, orientation)); + Integer orientation = request.get(CaptureRequest.JPEG_ORIENTATION); + params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION, + (orientation == null) ? 0 : orientation)); } // jpeg.quality @@ -496,6 +497,11 @@ public class LegacyRequestMapper { } } + if (meteringRectangleList.size() == 0) { + Log.w(TAG, "Only received metering rectangles with weight 0."); + return Arrays.asList(ParameterUtils.CAMERA_AREA_DEFAULT); + } + // Ignore any regions beyond our maximum supported count int countMeteringAreas = Math.min(maxNumMeteringAreas, meteringRectangleList.size()); |