handle null values when converting java.time primitives for Android APIs.
PiperOrigin-RevId: 224075252
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/libconversion_helpers.jar b/src/tools/android/java/com/google/devtools/build/android/desugar/libconversion_helpers.jar
index 840b1c7..01d124c 100755
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/libconversion_helpers.jar
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/libconversion_helpers.jar
Binary files differ
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/TimeConversions.java b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/TimeConversions.java
index 6ad0d5a..82dd5a7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/TimeConversions.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/TimeConversions.java
@@ -34,20 +34,32 @@
@SuppressWarnings("unused") // TODO(b/79121791): Support more APIs
private static j$.time.LocalDate fromLocalDate(java.time.LocalDate date) {
+ if (date == null) {
+ return null;
+ }
return j$.time.LocalDate.of(date.getYear(), date.getMonthValue(), date.getDayOfMonth());
}
@SuppressWarnings("unused") // TODO(b/79121791): Support more APIs
private static j$.time.MonthDay fromMonthDay(java.time.MonthDay monthDay) {
+ if (monthDay == null) {
+ return null;
+ }
return j$.time.MonthDay.of(monthDay.getMonthValue(), monthDay.getDayOfMonth());
}
@SuppressWarnings("unused") // TODO(b/79121791): Support more APIs
private static java.time.MonthDay toMonthDay(j$.time.MonthDay monthDay) {
+ if (monthDay == null) {
+ return null;
+ }
return java.time.MonthDay.of(monthDay.getMonthValue(), monthDay.getDayOfMonth());
}
private static j$.time.ZonedDateTime fromZonedDateTime(java.time.ZonedDateTime dateTime) {
+ if (dateTime == null) {
+ return null;
+ }
return j$.time.ZonedDateTime.of(
dateTime.getYear(),
dateTime.getMonthValue(),
@@ -60,6 +72,9 @@
}
private static java.time.ZonedDateTime toZonedDateTime(j$.time.ZonedDateTime dateTime) {
+ if (dateTime == null) {
+ return null;
+ }
return java.time.ZonedDateTime.of(
dateTime.getYear(),
dateTime.getMonthValue(),
