Merge "Camera: add proper nullptr check" into oc-dr1-dev

7 years ago · 4b5215993a
parent e6e9a4811d 3d145ae915
commit 4b5215993a
1 changed files with 3 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@ -2350,7 +2350,9 @@ void Camera3Device::setErrorStateLockedV(const char *fmt, va_list args) {

    mErrorCause = errorCause;

-    mRequestThread->setPaused(true);
+    if (mRequestThread != nullptr) {
+        mRequestThread->setPaused(true);
+    }
    internalUpdateStatusLocked(STATUS_ERROR);

    // Notify upstream about a device error