diff options
| author | Chien-Yu Chen <cychen@google.com> | 2017-02-04 01:03:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-04 01:03:01 +0000 |
| commit | ebac1398dc2544fed06e52ac781ef53f9865bdbf (patch) | |
| tree | c588cb641f07eb69b3ae93642a2bb8a4505b340d | |
| parent | 059145d3d1673e93db824728d9c25b2da4d66114 (diff) | |
| parent | 49d31d2e16be56abea40c0c6ec1f63caeebb21a9 (diff) | |
| download | bullhead-ebac1398dc2544fed06e52ac781ef53f9865bdbf.tar.gz | |
QCamera3: check channel nullptr
am: 49d31d2e16
Change-Id: I4c5d8147a89988cd4e9b3579f105538fbcd989df
| -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; } |