From 1392eb3d1802e9f894f87d7a7387207d1b6faca1 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 25 Mar 2014 11:49:08 -0700 Subject: Fix operator precedence Change-Id: I164708a5b76a341a185467b008ecbec98d58a6df --- media/libmedia/CharacterEncodingDetector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 @@ void CharacterEncodingDetector::detectAndConvert() { 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 { -- cgit v1.1