Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3c8bcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera2: legacy: Fill in default preCorrectionActiveArraySize"

parents fe330dc9 7b821ce9

core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

        }



        /*