From c2196d84c7ba9f48c9b65e6136055fd6bdf566db Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Thu, 2 Aug 2018 08:54:38 -0700
Subject: [PATCH] Camera: fix operator precedence bug

Test: none
Bug: 112135008
Change-Id: I518682026fbfdfbfda35de1921a00ef67e1272ee
---
 services/camera/libcameraservice/utils/TagMonitor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/camera/libcameraservice/utils/TagMonitor.cpp b/services/camera/libcameraservice/utils/TagMonitor.cpp
index c0a353f2ed..f4c49ec995 100644
--- a/services/camera/libcameraservice/utils/TagMonitor.cpp
+++ b/services/camera/libcameraservice/utils/TagMonitor.cpp
@@ -49,7 +49,8 @@ void TagMonitor::parseTagsToMonitor(String8 tagNames) {
     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';