diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-12 17:31:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 17:31:29 +0000 |
| commit | c36fbcdf37ec02314e7b8134bb0de5f624fa70fd (patch) | |
| tree | 683ee29c7a6fbac1fb4fc462aad862ce2cb8c952 | |
| parent | 02483465e294571a6a92fce4f38c933e77bf5e67 (diff) | |
| parent | f02f06c422a58ddaca49d14f21a196eaa435d07b (diff) | |
| download | frameworks_av-c36fbcdf37ec02314e7b8134bb0de5f624fa70fd.zip frameworks_av-c36fbcdf37ec02314e7b8134bb0de5f624fa70fd.tar.gz frameworks_av-c36fbcdf37ec02314e7b8134bb0de5f624fa70fd.tar.bz2 | |
am f02f06c4: Merge "camera: check Intent entry count before reading it"
* commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b':
camera: check Intent entry count before reading it
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 07654c0..081a6e6 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -1826,6 +1826,9 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { camera_metadata_entry_t intent = request->find(ANDROID_CONTROL_CAPTURE_INTENT); + + if (intent.count == 0) return BAD_VALUE; + if (intent.data.u8[0] == ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE) { res = request->update(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, fastInfo.bestStillCaptureFpsRange, 2); |