diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main')
2 files changed, 7 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index e32cdffc93..c8f848f4d7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -3582,6 +3582,12 @@ public class Expression { return literal; } + @NonNull + @Override + public Object[] toArray() { + return new Object[] {"literal", literal}; + } + /** * Returns a string representation of the expression literal. * 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 0de9234b7f..3edc202c8e 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 @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.NonNull; -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.utils.ThreadUtils; @@ -27,7 +26,7 @@ public abstract class Layer { /** * Validates if layer interaction is happening on the UI thread */ - protected void checkThread(){ + protected void checkThread() { ThreadUtils.checkThread("Layer"); } |