commit 93692c363213736f1c37413ac35a95d4be9a3bea
author Elliott Hughes <enh@google.com> Wed Mar 13 18:17:56 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 13 18:17:56 2013 -0700
tree 547e48e0c356ef6b0a74ef17b6d5a10fe082cbe7
parent 8749f35f71c984a189a50e65625983b5cf7274f3
parent 53309365f60b317b032e55643e9eb0122c6fbb3f

am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"

* commit '53309365f60b317b032e55643e9eb0122c6fbb3f':
  use date from 1970-01-01 to 2037-12-31 in DatePickerDialog

src/com/android/settings/DateTimeSettings.java

diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index b7bbc67..ab87527 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -244,6 +244,15 @@
                 calendar.get(Calendar.YEAR),
                 calendar.get(Calendar.MONTH),
                 calendar.get(Calendar.DAY_OF_MONTH));
+            // The system clock can't represent dates outside this range.
+            DatePickerDialog datePicker = (DatePickerDialog)d;
+            Calendar t = Calendar.getInstance();
+            t.clear();
+            t.set(1970, Calendar.JANUARY, 1);
+            datePicker.getDatePicker().setMinDate(t.getTimeInMillis());
+            t.clear();
+            t.set(2037, Calendar.DECEMBER, 31);
+            datePicker.getDatePicker().setMaxDate(t.getTimeInMillis());
             break;
         }
         case DIALOG_TIMEPICKER: {