From bd0f5ae5e26ec70d4db35f24c8e2902d66af2291 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Wed, 28 Oct 2015 11:10:11 +1100
Subject: [android] Fix NullPointerException in editor mode Fixes #2830

---
 .../src/main/java/com/mapbox/mapboxsdk/views/MapView.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'android/MapboxGLAndroidSDK/src/main')

diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index f1c021c0c7..a79199ffd4 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -585,7 +585,9 @@ public final class MapView extends FrameLayout {
         // Save the context
         mContext = context;
 
-        setWillNotDraw(false);
+        if (!isInEditMode()) {
+            setWillNotDraw(false);
+        }
 
         // Create the TextureView
         mTextureView = new TextureView(mContext);
@@ -2124,10 +2126,14 @@ public final class MapView extends FrameLayout {
 
     @Override
     public void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (isInEditMode()) {
+            return;
+        }
+
         if (!mNativeMapView.isPaused()) {
             mNativeMapView.renderSync();
         }
-        super.onDraw(canvas);
     }
 
     @Override
-- 
cgit v1.2.1