1 files changed, 6 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
index a11852be68..60bbe941a6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
@@ -16,6 +16,7 @@ import android.support.annotation.UiThread;
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 <% if (type === 'symbol') { -%>
@@ -148,12 +149,12 @@ public class <%- camelize(type) %>Layer extends Layer {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
 <% } -%>