diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-13 17:59:59 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-09-15 11:19:17 -0700 |
| commit | 66281c3a5d7eea486ddc6ad30088ba92956fd4fd (patch) | |
| tree | a796c6ea3a8eb4cf989efc6ecaf87d60083e008f /services/camera/libcameraservice/common | |
| parent | d176ec1e371a686c58385692a28da677e398c302 (diff) | |
| download | frameworks_av-66281c3a5d7eea486ddc6ad30088ba92956fd4fd.zip frameworks_av-66281c3a5d7eea486ddc6ad30088ba92956fd4fd.tar.gz frameworks_av-66281c3a5d7eea486ddc6ad30088ba92956fd4fd.tar.bz2 | |
Camera: Don't overwrite the error status
Bug: 10749544
Change-Id: I6096effde03e18ee1b8c63cf3b36dce0344054c5
Diffstat (limited to 'services/camera/libcameraservice/common')
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp index 060e2a2..e808bf3 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp +++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp @@ -95,7 +95,7 @@ status_t Camera2ClientBase<TClientBase>::initialize(camera_module_t *module) { if (res != OK) { ALOGE("%s: Camera %d: unable to initialize device: %s (%d)", __FUNCTION__, TClientBase::mCameraId, strerror(-res), res); - return NO_INIT; + return res; } res = mDevice->setNotifyCallback(this); |