1 files changed, 10 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
index b17c4a661a..ea89330c95 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
@@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers;
 import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
 
+import android.support.annotation.Nullable;
 import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.utils.ThreadUtils;
@@ -50,11 +51,13 @@ public abstract class Layer {
     }
   }
 
+  @NonNull
   public String getId() {
     checkThread();
     return nativeGetId();
   }
 
+  @NonNull
   public PropertyValue<String> getVisibility() {
     checkThread();
     return new PaintPropertyValue<>("visibility", (String) nativeGetVisibility());
@@ -84,9 +87,11 @@ public abstract class Layer {
   @Keep
   protected native void finalize() throws Throwable;
 
+  @NonNull
   @Keep
   protected native String nativeGetId();
 
+  @NonNull
   @Keep
   protected native Object nativeGetVisibility();
 
@@ -99,15 +104,18 @@ public abstract class Layer {
   @Keep
   protected native void nativeSetFilter(Object[] filter);
 
+  @NonNull
   @Keep
   protected native JsonElement nativeGetFilter();
 
   @Keep
   protected native void nativeSetSourceLayer(String sourceLayer);
 
+  @NonNull
   @Keep
   protected native String nativeGetSourceLayer();
 
+  @NonNull
   @Keep
   protected native String nativeGetSourceId();
 
@@ -127,7 +135,8 @@ public abstract class Layer {
     return nativePtr;
   }
 
-  private Object convertValue(Object value) {
+  @Nullable
+  private Object convertValue(@Nullable Object value) {
     if (value != null && value instanceof Expression) {
       return ((Expression) value).toArray();
     }