commit 1392eb3d1802e9f894f87d7a7387207d1b6faca1
author Glenn Kasten <gkasten@google.com> Tue Mar 25 11:49:08 2014 -0700
committer Glenn Kasten <gkasten@google.com> Tue Mar 25 11:50:21 2014 -0700
tree 1cce5cc09d21a1de2a7976da00766723194d9a23
parent d32ab80d7961bd0bb87e9402bb3017d30220b9e3

Fix operator precedence

Change-Id: I164708a5b76a341a185467b008ecbec98d58a6df

media/libmedia/CharacterEncodingDetector.cpp

diff --git a/media/libmedia/CharacterEncodingDetector.cpp b/media/libmedia/CharacterEncodingDetector.cpp
index 5a3bf9d..4992798 100644
--- a/media/libmedia/CharacterEncodingDetector.cpp
+++ b/media/libmedia/CharacterEncodingDetector.cpp
@@ -171,12 +171,12 @@
             int32_t inputLength = strlen(s);
             const char *enc;
 
-            if (!allprintable && !strcmp(name, "artist") ||
+            if (!allprintable && (!strcmp(name, "artist") ||
                     !strcmp(name, "albumartist") ||
                     !strcmp(name, "composer") ||
                     !strcmp(name, "genre") ||
                     !strcmp(name, "album") ||
-                    !strcmp(name, "title")) {
+                    !strcmp(name, "title"))) {
                 // use encoding determined from the combination of artist/album/title etc.
                 enc = combinedenc;
             } else {