1 files changed, 24 insertions, 0 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
index ed780811c0..b51c49e517 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
@@ -37,6 +37,7 @@ public class FillLayer extends Layer {
    * @param sourceId the id of the source
    */
   public FillLayer(String layerId, String sourceId) {
+    super();
     initialize(layerId, sourceId);
   }
 
@@ -48,6 +49,7 @@ public class FillLayer extends Layer {
    * @param sourceLayer the source layer to set
    */
   public void setSourceLayer(String sourceLayer) {
+    checkThread();
     nativeSetSourceLayer(sourceLayer);
   }
 
@@ -68,6 +70,7 @@ public class FillLayer extends Layer {
    * @return sourceLayer the source layer to get
    */
   public String getSourceLayer() {
+    checkThread();
     return nativeGetSourceLayer();
   }
 
@@ -77,6 +80,7 @@ public class FillLayer extends Layer {
    * @param filter the expression filter to set
    */
   public void setFilter(Expression filter) {
+    checkThread();
     nativeSetFilter(filter.toArray());
   }
 
@@ -98,6 +102,7 @@ public class FillLayer extends Layer {
    */
   @Nullable
   public Expression getFilter() {
+    checkThread();
     Expression expression = null;
     JsonArray array = (JsonArray) nativeGetFilter();
     if (array != null) {
@@ -126,6 +131,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getFillAntialias() {
+    checkThread();
     return (PropertyValue<Boolean>) new PropertyValue("fill-antialias", nativeGetFillAntialias());
   }
 
@@ -136,6 +142,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getFillOpacity() {
+    checkThread();
     return (PropertyValue<Float>) new PropertyValue("fill-opacity", nativeGetFillOpacity());
   }
 
@@ -145,6 +152,7 @@ public class FillLayer extends Layer {
    * @return transition options for Float
    */
   public TransitionOptions getFillOpacityTransition() {
+    checkThread();
     return nativeGetFillOpacityTransition();
   }
 
@@ -154,6 +162,7 @@ public class FillLayer extends Layer {
    * @param options transition options for Float
    */
   public void setFillOpacityTransition(TransitionOptions options) {
+    checkThread();
     nativeSetFillOpacityTransition(options.getDuration(), options.getDelay());
   }
 
@@ -164,6 +173,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillColor() {
+    checkThread();
     return (PropertyValue<String>) new PropertyValue("fill-color", nativeGetFillColor());
   }
 
@@ -175,6 +185,7 @@ public class FillLayer extends Layer {
    */
   @ColorInt
   public int getFillColorAsInt() {
+    checkThread();
     PropertyValue<String> value = getFillColor();
     if (value.isValue()) {
       return rgbaToColor(value.getValue());
@@ -189,6 +200,7 @@ public class FillLayer extends Layer {
    * @return transition options for String
    */
   public TransitionOptions getFillColorTransition() {
+    checkThread();
     return nativeGetFillColorTransition();
   }
 
@@ -198,6 +210,7 @@ public class FillLayer extends Layer {
    * @param options transition options for String
    */
   public void setFillColorTransition(TransitionOptions options) {
+    checkThread();
     nativeSetFillColorTransition(options.getDuration(), options.getDelay());
   }
 
@@ -208,6 +221,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillOutlineColor() {
+    checkThread();
     return (PropertyValue<String>) new PropertyValue("fill-outline-color", nativeGetFillOutlineColor());
   }
 
@@ -219,6 +233,7 @@ public class FillLayer extends Layer {
    */
   @ColorInt
   public int getFillOutlineColorAsInt() {
+    checkThread();
     PropertyValue<String> value = getFillOutlineColor();
     if (value.isValue()) {
       return rgbaToColor(value.getValue());
@@ -233,6 +248,7 @@ public class FillLayer extends Layer {
    * @return transition options for String
    */
   public TransitionOptions getFillOutlineColorTransition() {
+    checkThread();
     return nativeGetFillOutlineColorTransition();
   }
 
@@ -242,6 +258,7 @@ public class FillLayer extends Layer {
    * @param options transition options for String
    */
   public void setFillOutlineColorTransition(TransitionOptions options) {
+    checkThread();
     nativeSetFillOutlineColorTransition(options.getDuration(), options.getDelay());
   }
 
@@ -252,6 +269,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getFillTranslate() {
+    checkThread();
     return (PropertyValue<Float[]>) new PropertyValue("fill-translate", nativeGetFillTranslate());
   }
 
@@ -261,6 +279,7 @@ public class FillLayer extends Layer {
    * @return transition options for Float[]
    */
   public TransitionOptions getFillTranslateTransition() {
+    checkThread();
     return nativeGetFillTranslateTransition();
   }
 
@@ -270,6 +289,7 @@ public class FillLayer extends Layer {
    * @param options transition options for Float[]
    */
   public void setFillTranslateTransition(TransitionOptions options) {
+    checkThread();
     nativeSetFillTranslateTransition(options.getDuration(), options.getDelay());
   }
 
@@ -280,6 +300,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillTranslateAnchor() {
+    checkThread();
     return (PropertyValue<String>) new PropertyValue("fill-translate-anchor", nativeGetFillTranslateAnchor());
   }
 
@@ -290,6 +311,7 @@ public class FillLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillPattern() {
+    checkThread();
     return (PropertyValue<String>) new PropertyValue("fill-pattern", nativeGetFillPattern());
   }
 
@@ -299,6 +321,7 @@ public class FillLayer extends Layer {
    * @return transition options for String
    */
   public TransitionOptions getFillPatternTransition() {
+    checkThread();
     return nativeGetFillPatternTransition();
   }
 
@@ -308,6 +331,7 @@ public class FillLayer extends Layer {
    * @param options transition options for String
    */
   public void setFillPatternTransition(TransitionOptions options) {
+    checkThread();
     nativeSetFillPatternTransition(options.getDuration(), options.getDelay());
   }