diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-04 05:28:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-04 05:28:39 +0000 |
| commit | 7b938e3471d567cc46dc1e760af73a7a5827214c (patch) | |
| tree | 65c4b5e5e57d928798cc033181bee857c99842f7 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 05a93f35736abf151fcfa71744ea2888d046b357 (diff) | |
| parent | 75b0f0288c85cba5975b2898e6d37731b116a322 (diff) | |
Merge "Camera: move preCorrectionActiveArraySize override to cameraserver" into rvc-dev
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) { |