| commit | 4b5215993a7d78c0b9f1d5be9e55fb41cd8f32bc | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jul 27 23:11:00 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 27 23:11:00 2017 +0000 |
| tree | 77debf6b33e909510932d38f5cfd422da13ac477 | |
| parent | e6e9a4811dc43e5c393b2c45eca64d1f1608e8d0 [diff] | |
| parent | 3d145ae9158eca80c4cbfe436c5b8b04cb514c46 [diff] |
Merge "Camera: add proper nullptr check" into oc-dr1-dev
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 6421695..69b1d7d 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2350,7 +2350,9 @@ mErrorCause = errorCause; - mRequestThread->setPaused(true); + if (mRequestThread != nullptr) { + mRequestThread->setPaused(true); + } internalUpdateStatusLocked(STATUS_ERROR); // Notify upstream about a device error