Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20fec52a authored by Ben Wagner's avatar Ben Wagner Committed by android-build-merger
Browse files

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

am: fbf192af

* commit 'fbf192af':
  Fix shift precedence in FontListParser.

Change-Id: Ie2bad33009be067eb1809d79113382465e20a58e
parents e8386731 fbf192af

graphics/java/android/graphics/FontListParser.java

+4 −4
Original line number Diff line number Diff line
@@ -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);

        }