Merge "Do not call parseInt if value is empty" (0995958f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/XmlUtils.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1594,6 +1594,9 @@ public class XmlUtils {

		public static int readIntAttribute(XmlPullParser in, String name, int defaultValue) {
		final String value = in.getAttributeValue(null, name);
		if (TextUtils.isEmpty(value)) {
		return defaultValue;
		}
		try {
		return Integer.parseInt(value);
		} catch (NumberFormatException e) {
		@@ -1617,6 +1620,9 @@ public class XmlUtils {

		public static long readLongAttribute(XmlPullParser in, String name, long defaultValue) {
		final String value = in.getAttributeValue(null, name);
		if (TextUtils.isEmpty(value)) {
		return defaultValue;
		}
		try {
		return Long.parseLong(value);
		} catch (NumberFormatException e) {