diff options
| author | 2016-03-30 00:48:02 +0000 | |
|---|---|---|
| committer | 2016-03-30 00:48:03 +0000 | |
| commit | fbf192af5f88a596e41837024a8768c5abfcc33c (patch) | |
| tree | eab2d94c9667912b25c5c1939ef3e897f6b37667 | |
| parent | 7a6dc6cdfffa8ff8eea1c7c5f070cb318d0b02ce (diff) | |
| parent | 008c6c54908c423a034c40b3f79e712176c141b6 (diff) | |
Merge "Fix shift precedence in FontListParser." into nyc-dev
| -rw-r--r-- | graphics/java/android/graphics/FontListParser.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index 8f7c6a62a4a3..7871aa81dded 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -179,10 +179,10 @@ public class FontListParser { int tag = 0; String tagStr = parser.getAttributeValue(null, "tag"); if (tagStr != null && TAG_PATTERN.matcher(tagStr).matches()) { - tag = tagStr.charAt(0) << 24 + - tagStr.charAt(1) << 16 + - tagStr.charAt(2) << 8 + - tagStr.charAt(3); + tag = (tagStr.charAt(0) << 24) + + (tagStr.charAt(1) << 16) + + (tagStr.charAt(2) << 8) + + (tagStr.charAt(3) ); } else { throw new XmlPullParserException("Invalid tag attribute value.", parser, null); } |