diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-11-02 15:53:31 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-11-05 11:53:52 +0100 |
| commit | c481e5097319ddc222aec9ac5d582bf037b0a39b (patch) | |
| tree | cae5ab570338926d4dec73b59d96d2fbdf501df9 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types | |
| parent | 947af3059c5d2dec3dfdd8b8a6002679a6ccc055 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-nullify.tar.gz | |
[android] - nullify codebase with annotationsupstream/tvn-nullify
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types')
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java index b11a1b5bc7..662ab2df7f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.style.types; import android.support.annotation.Keep; +import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import java.util.Arrays; @@ -34,7 +35,7 @@ public class Formatted { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) { return true; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java index b3c36414cc..3a9802ebcd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java @@ -14,6 +14,7 @@ import java.util.Arrays; public class FormattedSection { private String text; private double fontScale; + @Nullable private String[] fontStack; /** |