1 files changed, 13 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
index 80d927128d..f3e7c31a4f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
@@ -13,6 +13,7 @@ import android.support.annotation.UiThread;
 import com.mapbox.mapboxsdk.style.layers.Property;
 import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.utils.ThreadUtils;
 
 /**
  * The global light source.
@@ -30,6 +31,7 @@ public class Light {
    * @param nativePtr pointer used by core
    */
   public Light(long nativePtr) {
+    checkThread();
     this.nativePtr = nativePtr;
   }
 <% for (const property of properties) { -%>
@@ -41,6 +43,7 @@ public class Light {
    * @param position of the light
    */
   public void set<%- camelize(property.name) %>(@NonNull Position position) {
+    checkThread();
     nativeSet<%- camelize(property.name) %>(position);
   }
 
@@ -50,6 +53,7 @@ public class Light {
    * @return <%- property.name %> as Position
    */
   public Position get<%- camelize(property.name) %>() {
+    checkThread();
     return nativeGet<%- camelize(property.name) %>();
   }
 <% } else { -%>
@@ -61,6 +65,7 @@ public class Light {
    * @param <%- property.name %> as int
    */
   public void set<%- camelize(property.name) %>(@ColorInt int <%- property.name %>) {
+    checkThread();
     nativeSet<%- camelize(property.name) %>(PropertyFactory.colorToRgbaString(<%- property.name %>));
   }
 <% } -%>
@@ -71,6 +76,7 @@ public class Light {
    * @param <%- property.name %> as <%- propertyType(property) %>
    */
   public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), " ") %><%- propertyJavaType(property) %> <%- property.name %>) {
+    checkThread();
     nativeSet<%- camelize(property.name) %>(<%- property.name %>);
   }
 
@@ -80,6 +86,7 @@ public class Light {
    * @return <%- property.name %> as <%- propertyType(property) %>
    */
   <%- propertyTypeAnnotation(property) %> public <%- propertyJavaType(property) %> get<%- camelize(property.name) %>() {
+    checkThread();
     return nativeGet<%- camelize(property.name) %>();
   }
 <% } -%>
@@ -91,6 +98,7 @@ public class Light {
    * @return transition options for <%- property.name %>
    */
   public TransitionOptions get<%- camelize(property.name) %>Transition() {
+    checkThread();
     return nativeGet<%- camelize(property.name) %>Transition();
   }
 
@@ -100,11 +108,16 @@ public class Light {
    * @param options transition options for <%- property.name %>
    */
   public void set<%- camelize(property.name) %>Transition(TransitionOptions options) {
+    checkThread();
     nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay());
   }
 <% } -%>
 <% } -%>
 
+  private void checkThread(){
+    ThreadUtils.checkThread("Light");
+  }
+
 <% for (const property of properties) { -%>
 <% if (property.name == "position") {-%>
   private native void nativeSet<%- camelize(property.name) %>(Position position);