[MaterialDatePicker] Fix NPE

PiperOrigin-RevId: 504263005
material-components · Jan 24, 2023 · 2cef555 · 2cef555
1 parent 73678f5
commit 2cef555
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
@@ -182,8 +182,9 @@ public final void onSaveInstanceState(@NonNull Bundle bundle) {
 
     CalendarConstraints.Builder constraintsBuilder =
         new CalendarConstraints.Builder(calendarConstraints);
-    if (calendar.getCurrentMonth() != null) {
-      constraintsBuilder.setOpenAt(calendar.getCurrentMonth().timeInMillis);
+    Month currentMonth = calendar == null ? null : calendar.getCurrentMonth();
+    if (currentMonth != null) {
+      constraintsBuilder.setOpenAt(currentMonth.timeInMillis);
     }
     bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, constraintsBuilder.build());
     bundle.putParcelable(DAY_VIEW_DECORATOR_KEY, dayViewDecorator);