summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Seigo Nonaka <nona@google.com> 2015-12-10 18:23:37 -0800
committer Seigo Nonaka <nona@google.com> 2015-12-10 18:23:37 -0800
commitac3f10f153319e2494fb57a90360031f148e404c (patch)
treeebb81caf85cea226baa0d2ffd1f87bd8143ccd85
parentf0fc0c835e5e0af4fdf3bf82f112f6bffe105c9d (diff)
Fix invalid API use of XmlPullParser.getAttributeValue.
The 1st argument of the getAttributeValue is a namespace of the xml. Bug: 10861108 Change-Id: I73fd15eca7101b745870ca7b6509b1dbfcc9b0d7
-rw-r--r--graphics/java/android/graphics/FontListParser.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java
index e4494ca4b64c..2596f53cb9f4 100644
--- a/graphics/java/android/graphics/FontListParser.java
+++ b/graphics/java/android/graphics/FontListParser.java
@@ -114,7 +114,8 @@ public class FontListParser {
if (parser.getEventType() != XmlPullParser.START_TAG) continue;
String tag = parser.getName();
if (tag.equals("font")) {
- int ttcIndex = Integer.parseInt(parser.getAttributeValue("0", "ttcIndex"));
+ String ttcIndexStr = parser.getAttributeValue(null, "ttcIndex");
+ int ttcIndex = ttcIndexStr == null ? 0 : Integer.parseInt(ttcIndexStr);
String weightStr = parser.getAttributeValue(null, "weight");
int weight = weightStr == null ? 400 : Integer.parseInt(weightStr);
boolean isItalic = "italic".equals(parser.getAttributeValue(null, "style"));