summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-03-21 20:58:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-21 20:58:30 +0000
commit3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1 (patch)
treeb2c3b6c9ab0c9a001b5931f882772c0213c73a33 /include/camera
parent9e36b5a5c630c303b5007fdeb5c0df83b953adf4 (diff)
parentcc76ec941661206e3a3c53f9aff789c839a869bb (diff)
downloadframeworks_av-3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1.zip
frameworks_av-3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1.tar.gz
frameworks_av-3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1.tar.bz2
Merge changes Ic92924ce,I53107a39 into jb-mr2-dev
* changes: Camera2: getSceneMode should return NULL when there are no supported scene modes commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions