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

Commit 4549708b authored by Emilian Peev's avatar Emilian Peev Committed by Automerger Merge Worker
Browse files

Camera: Remove R&C session parameter name shadowing am: 40b71eec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22533437



Change-Id: I3f847d789b8ce692c13920a9ceed3cf758dc0f5b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c342fb2e 40b71eec

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -1391,11 +1391,6 @@ status_t Camera3Device::filterParamsAndConfigureLocked(const CameraMetadata& ses 
            request->mSettingsList.push_back(settingsList);

            request->mSettingsList.push_back(settingsList);





            if (rotateAndCropSessionKey) {

            if (rotateAndCropSessionKey) {

                sp<CaptureRequest> request = new CaptureRequest();

                PhysicalCameraSettings settingsList;

                settingsList.metadata = filteredParams;

                request->mSettingsList.push_back(settingsList);



                auto rotateAndCropEntry = filteredParams.find(ANDROID_SCALER_ROTATE_AND_CROP);

                auto rotateAndCropEntry = filteredParams.find(ANDROID_SCALER_ROTATE_AND_CROP);

                if (rotateAndCropEntry.count > 0 &&

                if (rotateAndCropEntry.count > 0 &&

                        rotateAndCropEntry.data.u8[0] == ANDROID_SCALER_ROTATE_AND_CROP_AUTO) {

                        rotateAndCropEntry.data.u8[0] == ANDROID_SCALER_ROTATE_AND_CROP_AUTO) {