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

Commit dc3bb2c9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Populate LENS_INFO_SHADING_MAP_SIZE for physical camera result" into main

parents ca14c189 e1f065ed
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -2280,6 +2280,19 @@ public class CameraDeviceImpl extends CameraDevice
                // TODO: Handle CameraCharacteristics access from CaptureResult correctly.
                result.set(CameraCharacteristics.LENS_INFO_SHADING_MAP_SIZE,
                        getCharacteristics().get(CameraCharacteristics.LENS_INFO_SHADING_MAP_SIZE));
                Map<String, CameraCharacteristics> physicalIdToChars = getPhysicalIdToChars();
                for (PhysicalCaptureResultInfo oneResultInfo : physicalResults) {
                    String physicalId = oneResultInfo.getCameraId();
                    CameraMetadataNative physicalResult = oneResultInfo.getCameraMetadata();
                    CameraCharacteristics ch = physicalIdToChars.get(physicalId);
                    if (ch != null)  {
                        physicalResult.set(CameraCharacteristics.LENS_INFO_SHADING_MAP_SIZE,
                                ch.get(CameraCharacteristics.LENS_INFO_SHADING_MAP_SIZE));
                    } else {
                        Log.e(TAG, "Unable to find characteristics for physical camera "
                                + physicalId);
                    }
                }

                final CaptureCallbackHolder holder =
                        CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId);