OSDN Git Service

Merge changes Ic92924ce,I53107a39 into jb-mr2-dev
authorIgor Murashkin <iam@google.com>
Thu, 21 Mar 2013 20:58:29 +0000 (20:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Mar 2013 20:58:30 +0000 (20:58 +0000)
commit3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1
treeb2c3b6c9ab0c9a001b5931f882772c0213c73a33
parent9e36b5a5c630c303b5007fdeb5c0df83b953adf4
parentcc76ec941661206e3a3c53f9aff789c839a869bb
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.