diff options
author | Elliott Hughes <enh@google.com> | 2013-07-18 17:38:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-18 17:38:57 +0000 |
commit | 0bad537093ed5b493e4c2af778cf802a2cf2c15f (patch) | |
tree | 3f8583a5405cc253db9252b7892d6590bc0deb79 | |
parent | 15cb526ece1420b1ae2061e20fd0982d82b41aae (diff) | |
parent | 2ddce3226e2a1f380dfc4ad3f7e962dfdbfc39dd (diff) | |
download | base-0bad537093ed5b493e4c2af778cf802a2cf2c15f.tar.gz |
Merge "Handle missing and invalid numeric values in XmlUtils."
-rw-r--r-- | core/java/com/android/internal/util/XmlUtils.java | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/core/java/com/android/internal/util/XmlUtils.java b/core/java/com/android/internal/util/XmlUtils.java index 6a09fe07f843..1005cc451b8b 100644 --- a/core/java/com/android/internal/util/XmlUtils.java +++ b/core/java/com/android/internal/util/XmlUtils.java @@ -800,16 +800,8 @@ public class XmlUtils } throw new XmlPullParserException( "Unexpected end of document in <string>"); - } else if (tagName.equals("int")) { - res = Integer.parseInt(parser.getAttributeValue(null, "value")); - } else if (tagName.equals("long")) { - res = Long.valueOf(parser.getAttributeValue(null, "value")); - } else if (tagName.equals("float")) { - res = new Float(parser.getAttributeValue(null, "value")); - } else if (tagName.equals("double")) { - res = new Double(parser.getAttributeValue(null, "value")); - } else if (tagName.equals("boolean")) { - res = Boolean.valueOf(parser.getAttributeValue(null, "value")); + } else if ((res = readThisPrimitiveValueXml(parser, tagName)) != null) { + // all work already done by readThisPrimitiveValueXml } else if (tagName.equals("int-array")) { parser.next(); res = readThisIntArrayXml(parser, "int-array", name); @@ -862,6 +854,31 @@ public class XmlUtils "Unexpected end of document in <" + tagName + ">"); } + private static final Object readThisPrimitiveValueXml(XmlPullParser parser, String tagName) + throws XmlPullParserException, java.io.IOException + { + try { + if (tagName.equals("int")) { + return Integer.parseInt(parser.getAttributeValue(null, "value")); + } else if (tagName.equals("long")) { + return Long.valueOf(parser.getAttributeValue(null, "value")); + } else if (tagName.equals("float")) { + return new Float(parser.getAttributeValue(null, "value")); + } else if (tagName.equals("double")) { + return new Double(parser.getAttributeValue(null, "value")); + } else if (tagName.equals("boolean")) { + return Boolean.valueOf(parser.getAttributeValue(null, "value")); + } else { + return null; + } + } catch (NullPointerException e) { + throw new XmlPullParserException("Need value attribute in <" + tagName + ">"); + } catch (NumberFormatException e) { + throw new XmlPullParserException( + "Not a number in value attribute in <" + tagName + ">"); + } + } + public static final void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException { int type; |