Fix NPE from MaterialDatePicker rotation when MaterialCalendar is not…

… visible. calendar.getCurrentMonth() is nullable so we check before accessing PiperOrigin-RevId: 268290292
material-components · Oct 3, 2019 · e0a4d4e · e0a4d4e
1 parent 340497a
commit e0a4d4e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
@@ -117,11 +117,13 @@ public final void onSaveInstanceState(@NonNull Bundle bundle) {
     super.onSaveInstanceState(bundle);
     bundle.putInt(OVERRIDE_THEME_RES_ID, overrideThemeResId);
     bundle.putParcelable(GRID_SELECTOR_KEY, dateSelector);
-    bundle.putParcelable(
-        CALENDAR_CONSTRAINTS_KEY,
-        new CalendarConstraints.Builder(calendarConstraints)
-            .setOpenAt(calendar.getCurrentMonth().timeInMillis)
-            .build());
+
+    CalendarConstraints.Builder constraintsBuilder =
+        new CalendarConstraints.Builder(calendarConstraints);
+    if (calendar.getCurrentMonth() != null) {
+      constraintsBuilder.setOpenAt(calendar.getCurrentMonth().timeInMillis);
+    }
+    bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, constraintsBuilder.build());
     bundle.putInt(TITLE_TEXT_RES_ID_KEY, titleTextResId);
   }