commit 7f1732ee0d2c0571f8a00cd6ccbaa74cf8dd260c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 02 17:31:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 02 17:31:36 2018 +0000
tree 3dad37728e3fa5a9cbb8532ca8bcabf781d3270b
parent 978dcac6101c416158ca234e6ef01baa861bbcd0
parent c2196d84c7ba9f48c9b65e6136055fd6bdf566db

Merge "Camera: fix operator precedence bug"

services/camera/libcameraservice/utils/TagMonitor.cpp

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';