am 9d3df9b7: am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev

* commit '9d3df9b7bacb7ba51d337893a7b5269d69d697d1':
  Camera2: update legacy metadata
This commit is contained in:
Yin-Chia Yeh
2015-05-28 18:21:44 +00:00
committed by Android Git Automerger

View File

@@ -754,6 +754,7 @@ public class LegacyMetadataMapper {
CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP ,
CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES ,
CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS ,
CameraCharacteristics.CONTROL_AVAILABLE_MODES ,
CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES ,
CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES ,
CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES ,