diff options
author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-05-13 23:20:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 23:20:27 +0000 |
commit | 467b6e152e3064b8da58551effb39e72acec14af (patch) | |
tree | 847e606853829dd5d2739c76dfb3dbf3137f7773 /services/camera/libcameraservice | |
parent | 56d78dffbd2e88987f693edb56d8fb9e5cd1c9f8 (diff) | |
parent | b28c344904e9bab979ec58a1c7b42b0bf25234ba (diff) | |
download | frameworks_av-467b6e152e3064b8da58551effb39e72acec14af.zip frameworks_av-467b6e152e3064b8da58551effb39e72acec14af.tar.gz frameworks_av-467b6e152e3064b8da58551effb39e72acec14af.tar.bz2 |
Merge "Camera: update CameraModule deriveKey" into mnc-dev
Diffstat (limited to 'services/camera/libcameraservice')
-rw-r--r-- | services/camera/libcameraservice/common/CameraModule.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/common/CameraModule.cpp b/services/camera/libcameraservice/common/CameraModule.cpp index 064ff71..c662853 100644 --- a/services/camera/libcameraservice/common/CameraModule.cpp +++ b/services/camera/libcameraservice/common/CameraModule.cpp @@ -31,6 +31,7 @@ void CameraModule::deriveCameraCharacteristicsKeys( // Keys added in HAL3.3 if (deviceVersion < CAMERA_DEVICE_API_VERSION_3_3) { + const size_t NUM_DERIVED_KEYS_HAL3_3 = 3; Vector<uint8_t> controlModes; uint8_t data = ANDROID_CONTROL_AE_LOCK_AVAILABLE_TRUE; chars.update(ANDROID_CONTROL_AE_LOCK_AVAILABLE, &data, /*count*/1); @@ -78,6 +79,17 @@ void CameraModule::deriveCameraCharacteristicsKeys( } chars.update(ANDROID_CONTROL_AVAILABLE_MODES, controlModes); + + entry = chars.find(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS); + Vector<int32_t> availableCharsKeys; + availableCharsKeys.setCapacity(entry.count + NUM_DERIVED_KEYS_HAL3_3); + for (size_t i = 0; i < entry.count; i++) { + availableCharsKeys.push(entry.data.i32[i]); + } + availableCharsKeys.push(ANDROID_CONTROL_AE_LOCK_AVAILABLE); + availableCharsKeys.push(ANDROID_CONTROL_AWB_LOCK_AVAILABLE_TRUE); + availableCharsKeys.push(ANDROID_CONTROL_AVAILABLE_MODES); + chars.update(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS, availableCharsKeys); } return; } |