| commit | 1097d57d292d4a2e17c0b9440a52afe0a8e07923 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jul 27 23:24:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 27 23:24:11 2017 +0000 |
| tree | 8947612d6a129c08f358d1505c0e26d580239afe | |
| parent | 1ec73bea63577c13de6c9373d555c5e4523f3026 [diff] | |
| parent | 4b5215993a7d78c0b9f1d5be9e55fb41cd8f32bc [diff] |
Merge "Camera: add proper nullptr check" into oc-dr1-dev am: 4b5215993a Change-Id: I326e2ded58282529a58df7091b4124531dcf1e7a
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