diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-09-23 17:47:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 17:47:01 +0000 |
| commit | 88b4cc81779cc7da9c438e1bcd2e9f0897157bbd (patch) | |
| tree | b9f87c0b989ca1e1c67e92e05474d4f2388cd820 | |
| parent | 5110d6a00db5973881d06c39c60e477fb90a2d55 (diff) | |
| parent | f79f8ca07f9130d67ba575748cf3481f32dcad9f (diff) | |
| download | frameworks_av-88b4cc81779cc7da9c438e1bcd2e9f0897157bbd.zip frameworks_av-88b4cc81779cc7da9c438e1bcd2e9f0897157bbd.tar.gz frameworks_av-88b4cc81779cc7da9c438e1bcd2e9f0897157bbd.tar.bz2 | |
Merge "Camera2Client: log an error when autoFocus is called in wrong state" into lmp-dev
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index fe2f299..48ec730 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -1217,6 +1217,8 @@ status_t Camera2Client::autoFocus() { { SharedParameters::Lock l(mParameters); if (l.mParameters.state < Parameters::PREVIEW) { + ALOGE("%s: Camera %d: Call autoFocus when preview is inactive (state = %d).", + __FUNCTION__, mCameraId, l.mParameters.state); return INVALID_OPERATION; } |