diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-06-06 14:22:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-06 14:22:29 -0700 |
| commit | dcb614cda0fb11d06dc3e7f508367a36baaebd54 (patch) | |
| tree | 048ee1a108d59f4c3e05a4a46dcbf9a27862387a /services | |
| parent | 9490a96eab4b25b23777b297de75186dfb932577 (diff) | |
| parent | e097efde4363f80d5ffc34da6ec6253fbd4e5397 (diff) | |
| download | frameworks_av-dcb614cda0fb11d06dc3e7f508367a36baaebd54.zip frameworks_av-dcb614cda0fb11d06dc3e7f508367a36baaebd54.tar.gz frameworks_av-dcb614cda0fb11d06dc3e7f508367a36baaebd54.tar.bz2 | |
am e097efde: am b05eeaed: camera3: Fix crash in set error state.
* commit 'e097efde4363f80d5ffc34da6ec6253fbd4e5397':
camera3: Fix crash in set error state.
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera3Device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp index 3f2287f..1596648 100644 --- a/services/camera/libcameraservice/Camera3Device.cpp +++ b/services/camera/libcameraservice/Camera3Device.cpp @@ -1125,7 +1125,7 @@ void Camera3Device::setErrorStateLockedV(const char *fmt, va_list args) { ALOGE("Camera %d: %s", mId, errorCause.string()); // But only do error state transition steps for the first error - if (mStatus == STATUS_ERROR) return; + if (mStatus == STATUS_ERROR || mStatus == STATUS_UNINITIALIZED) return; mErrorCause = errorCause; |