diff options
| author | Chien-Yu Chen <cychen@google.com> | 2017-02-03 14:58:33 -0800 |
|---|---|---|
| committer | Chien-Yu Chen <cychen@google.com> | 2017-02-03 15:04:04 -0800 |
| commit | 49d31d2e16be56abea40c0c6ec1f63caeebb21a9 (patch) | |
| tree | 0455944b775373ca7cf4de858c243dc94b663ed6 | |
| parent | 5c566daf137fd8ed6e903bdfd85e3be7953f32be (diff) | |
| download | bullhead-49d31d2e16be56abea40c0c6ec1f63caeebb21a9.tar.gz | |
QCamera3: check channel nullptrnougat-mr2-dev
Only calls channel->stop() if channel is not nullptr.
Bug: 32706326
Change-Id: I8935eb4e16edd928d0f67ab161fe77f4c180ea7e
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index e4782aa..26c9acd 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -9485,7 +9485,9 @@ int32_t QCamera3HardwareInterface::stopAllChannels() for (List<stream_info_t *>::iterator it = mStreamInfo.begin(); it != mStreamInfo.end(); it++) { QCamera3Channel *channel = (QCamera3Channel *)(*it)->stream->priv; - channel->stop(); + if (channel != nullptr) { + channel->stop(); + } (*it)->status = INVALID; } |