diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-02 23:03:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-02 23:03:48 +0000 |
| commit | 98e099aca2089decdf3486ae216c89766cc252f2 (patch) | |
| tree | 9f52bb82430e2675376c8fa2f59672fde65dd40a /services | |
| parent | 04a840d9a0eea7d0816b6b665aa150649c46974f (diff) | |
| parent | 61675c0a7b5d88d5f525b1a1926fab6a7b2c7904 (diff) | |
| download | frameworks_av-98e099aca2089decdf3486ae216c89766cc252f2.zip frameworks_av-98e099aca2089decdf3486ae216c89766cc252f2.tar.gz frameworks_av-98e099aca2089decdf3486ae216c89766cc252f2.tar.bz2 | |
Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/ZslProcessor3.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp index 88bcefb..be1ffeb 100644 --- a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp +++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp @@ -305,7 +305,10 @@ status_t ZslProcessor3::clearZslQueue() { } status_t ZslProcessor3::clearZslQueueLocked() { - return mZslStream->clearInputRingBuffer(); + if (mZslStream != 0) { + return mZslStream->clearInputRingBuffer(); + } + return OK; } void ZslProcessor3::dump(int fd, const Vector<String16>& /*args*/) const { |