diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-12 17:41:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 17:41:42 +0000 |
| commit | 39c852640929d90ae5bcbf49842cbd64bffaa29e (patch) | |
| tree | 82fa3095982ffdcc515f39ea0e6b70fa08ffd937 | |
| parent | 5e4c4f12337ff4d7ceb105bcd441bb7aea6ab070 (diff) | |
| parent | 7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0 (diff) | |
| download | frameworks_av-39c852640929d90ae5bcbf49842cbd64bffaa29e.zip frameworks_av-39c852640929d90ae5bcbf49842cbd64bffaa29e.tar.gz frameworks_av-39c852640929d90ae5bcbf49842cbd64bffaa29e.tar.bz2 | |
am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"
* commit '7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0':
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 5bfb969..65592d3 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -1754,6 +1754,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); |