summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorYin-Chia Yeh <yinchiayeh@google.com>2015-05-28 15:58:22 -0700
committerYin-Chia Yeh <yinchiayeh@google.com>2015-06-01 10:44:04 -0700
commit71c605c54abfb182e2b38142f3cf98a6fc1ea75c (patch)
treef1fbbd72514897d5ef950873d2d3b955ceab4024 /core/java/android/hardware
parentc2ddb3e452d4d3a360ad697bf89a786f2af7a377 (diff)
downloadframeworks_base-71c605c54abfb182e2b38142f3cf98a6fc1ea75c.zip
frameworks_base-71c605c54abfb182e2b38142f3cf98a6fc1ea75c.tar.gz
frameworks_base-71c605c54abfb182e2b38142f3cf98a6fc1ea75c.tar.bz2
Camera2: Add missing LEGACY available keys
Add missing available characteristics keys. Bug: 20883751 Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
index 8776418..1c75484 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -752,11 +752,13 @@ public class LegacyMetadataMapper {
CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES ,
CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE ,
CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP ,
+ CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE ,
CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES ,
CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS ,
CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES ,
CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES ,
CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES ,
+ CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE ,
CameraCharacteristics.CONTROL_MAX_REGIONS ,
CameraCharacteristics.FLASH_INFO_AVAILABLE ,
CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL ,