diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-05 01:11:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-05 01:11:35 +0000 |
| commit | 9ca22541e8f3954e474ceaac460024dd41023214 (patch) | |
| tree | 65c4b5e5e57d928798cc033181bee857c99842f7 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 7d054ed1deae08cb23eb54c063c12772e96831fd (diff) | |
| parent | 7b938e3471d567cc46dc1e760af73a7a5827214c (diff) | |
Snap for 6461449 from 7b938e3471d567cc46dc1e760af73a7a5827214c to rvc-release
Change-Id: Ife1e73f29a472c5f1ce58ae245ca310bb3600776
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
| -rw-r--r-- | camera/common/1.0/default/CameraModule.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 467c121a94..86f26e480c 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp @@ -194,16 +194,6 @@ void CameraModule::deriveCameraCharacteristicsKeys( } } - // Always add a default for the pre-correction active array if the vendor chooses to omit this - camera_metadata_entry entry = chars.find(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE); - if (entry.count == 0) { - Vector<int32_t> preCorrectionArray; - entry = chars.find(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE); - preCorrectionArray.appendArray(entry.data.i32, entry.count); - chars.update(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE, preCorrectionArray); - derivedCharKeys.push(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE); - } - // Add those newly added keys to AVAILABLE_CHARACTERISTICS_KEYS // This has to be done at this end of this function. if (derivedCharKeys.size() > 0) { |