From f3311c940aee73afb0eeeedde4799e45f544dbc3 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Tue, 23 Mar 2010 17:32:41 -0700 Subject: [PATCH] Fix bug 2531732 - DateTimeView explodes on bad system date format. Fall back to a default date format instead of throwing an exception. Change-Id: I827a81d9610ea7f9243c1c33579e7a5d3b423692 --- core/java/android/widget/DateTimeView.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 3dab9f2127e2..6b845b049ff7 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -206,7 +206,12 @@ public class DateTimeView extends TextView { if (format == null || "".equals(format)) { return DateFormat.getDateInstance(DateFormat.SHORT); } else { - return new SimpleDateFormat(format); + try { + return new SimpleDateFormat(format); + } catch (IllegalArgumentException e) { + // If we tried to use a bad format string, fall back to a default. + return DateFormat.getDateInstance(DateFormat.SHORT); + } } } -- 2.11.0