summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Almaz Mingaleev <mingaleev@google.com> 2020-12-04 20:18:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-12-04 20:18:57 +0000
commit47a2370972fc41a3c77ea05f616e37b6a5b74829 (patch)
tree6fbe77d065b921de8ee780d438ce3a697d37c63a
parentb0e9cc91ebdba215a75fd468da2dc4918bf9a5b3 (diff)
parentde029e6906b41ad326d60d161cecf3fc038bf504 (diff)
Merge "Mark GeoLocationTimeZoneSuggestion.mZoneIds as nullable."
-rw-r--r--services/core/java/com/android/server/timezonedetector/GeolocationTimeZoneSuggestion.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/timezonedetector/GeolocationTimeZoneSuggestion.java b/services/core/java/com/android/server/timezonedetector/GeolocationTimeZoneSuggestion.java
index 118899add968..1867ee207958 100644
--- a/services/core/java/com/android/server/timezonedetector/GeolocationTimeZoneSuggestion.java
+++ b/services/core/java/com/android/server/timezonedetector/GeolocationTimeZoneSuggestion.java
@@ -61,7 +61,7 @@ import java.util.StringTokenizer;
*/
public final class GeolocationTimeZoneSuggestion {
- @NonNull private final List<String> mZoneIds;
+ @Nullable private final List<String> mZoneIds;
@Nullable private ArrayList<String> mDebugInfo;
public GeolocationTimeZoneSuggestion(@Nullable List<String> zoneIds) {