diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-12 17:36:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 17:36:42 +0000 |
| commit | 7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0 (patch) | |
| tree | 8e3e9b1ddc88164140953815dade1c70f6e5e4e3 | |
| parent | cf79c7a576837d8bccecc80612a1f6f30bb328a8 (diff) | |
| parent | c36fbcdf37ec02314e7b8134bb0de5f624fa70fd (diff) | |
| download | frameworks_av-7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0.zip frameworks_av-7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0.tar.gz frameworks_av-7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0.tar.bz2 | |
am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"
* commit 'c36fbcdf37ec02314e7b8134bb0de5f624fa70fd':
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); |