Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix shift precedence in FontListParser." into nyc-dev

Browse Source
This commit is contained in:
Roozbeh Pournader
2016-03-30 00:48:02 +00:00
committed by Android (Google) Code Review
parent 7a6dc6cdff 008c6c5490
commit fbf192af5f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/graphics/FontListParser.java
View File

@@ -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);
}