summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-10-22 14:02:44 +0200
committerTobrun <tobrun@mapbox.com>2018-10-23 13:19:26 +0200
commit83ac1152757dfda0964383ac0fed6d87cd188b6d (patch)
treeba1a71e914898c95b8423a6198070f4401c9bb9d /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
parent3ef5bc604b29a5e3c1050bff66f78c49ffd898cc (diff)
downloadqtlocation-mapboxgl-83ac1152757dfda0964383ac0fed6d87cd188b6d.tar.gz
Revert "[android] - infer nullity"
This reverts commit 617742710852a5a958a13f2b659f8c307973e49d.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
index 2650664151..a588ff6d23 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.annotations;
import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -122,11 +121,11 @@ public abstract class Annotation implements Comparable<Annotation> {
* @return returns true both id's match else returns false.
*/
@Override
- public boolean equals(@Nullable Object object) {
+ public boolean equals(Object object) {
if (this == object) {
return true;
}
- if (!(object instanceof Annotation)) {
+ if (object == null || !(object instanceof Annotation)) {
return false;
}
Annotation that = (Annotation) object;