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

Commit 1f9a3cc3 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 2389454 - DateTimeView can NPE if "date_format" isn't set in Settings."

parents 8a7ac8db 77472104

core/java/android/widget/DateTimeView.java

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public class DateTimeView extends TextView { 
    private DateFormat getDateFormat() {

        String format = Settings.System.getString(getContext().getContentResolver(),

                Settings.System.DATE_FORMAT);

        if ("".equals(format)) {

        if (format == null || "".equals(format)) {

            return DateFormat.getDateInstance(DateFormat.SHORT);

        } else {

            return new SimpleDateFormat(format);