commit | c2196d84c7ba9f48c9b65e6136055fd6bdf566db | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Aug 02 08:54:38 2018 -0700 |
committer | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Aug 02 08:54:38 2018 -0700 |
tree | e738134b2a0f201924364b72f77a93f33898914d | |
parent | 021c41956c6d7c172f8313407da53c8d6eb6db6e [diff] |
Camera: fix operator precedence bug Test: none Bug: 112135008 Change-Id: I518682026fbfdfbfda35de1921a00ef67e1272ee
diff --git a/services/camera/libcameraservice/utils/TagMonitor.cpp b/services/camera/libcameraservice/utils/TagMonitor.cpp index c0a353f..f4c49ec 100644 --- a/services/camera/libcameraservice/utils/TagMonitor.cpp +++ b/services/camera/libcameraservice/utils/TagMonitor.cpp
@@ -49,7 +49,8 @@ std::lock_guard<std::mutex> lock(mMonitorMutex); // Expand shorthands - if (ssize_t idx = tagNames.find("3a") != -1) { + ssize_t idx = tagNames.find("3a"); + if (idx != -1) { ssize_t end = tagNames.find(",", idx); char* start = tagNames.lockBuffer(tagNames.size()); start[idx] = '\0';