diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-02-04 00:43:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-04 00:43:04 +0000 |
| commit | 9f5d6c9700a09a8a926cbb7bc6a6c5a645e3ec2a (patch) | |
| tree | fc763247efe90f96af30627541ed3b48ad8726c5 | |
| parent | daa33ed79c25505342245cc1939d3c11cc1da8fc (diff) | |
| parent | 7573357c073b0b9abcd7607b1c0723a64a19a444 (diff) | |
| download | angler-nougat-mr2-dev.tar.gz | |
Merge "QCamera3: check channel nullptr" into nyc-mr2-devnougat-mr2-dev
| -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 cb5d3ff..75a82ab 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -9488,7 +9488,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; } |