diff options
| author | 2018-08-03 17:21:25 +0000 | |
|---|---|---|
| committer | 2018-08-03 17:21:25 +0000 | |
| commit | 4d3c8bcb5541f513134d95f6fd1df72d80918662 (patch) | |
| tree | 813f5b189c8ce6feef911522d6f8699c41d46a33 | |
| parent | fe330dc9f3eacc5a9926e96aeb4dc30f02709f65 (diff) | |
| parent | 7b821ce99d4997dc5051835effcb29a2a5e862ff (diff) | |
Merge "Camera2: legacy: Fill in default preCorrectionActiveArraySize"
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index 5423ca97eb28..8822f713257d 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java @@ -781,6 +781,7 @@ public class LegacyMetadataMapper { CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE , CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE , CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE , + CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE , CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE , CameraCharacteristics.SENSOR_ORIENTATION , CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES , @@ -941,11 +942,12 @@ public class LegacyMetadataMapper { // Use the largest jpeg size (by area) for both active array and pixel array Size largestJpegSize = getLargestSupportedJpegSizeByArea(p); /* - * sensor.info.activeArraySize + * sensor.info.activeArraySize, and preCorrectionActiveArraySize */ { Rect activeArrayRect = ParamsUtils.createRect(largestJpegSize); m.set(SENSOR_INFO_ACTIVE_ARRAY_SIZE, activeArrayRect); + m.set(SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE, activeArrayRect); } /* |