diff options
author | Leith Bade <leith@mapbox.com> | 2015-10-28 11:10:11 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-10-28 11:10:11 +1100 |
commit | bd0f5ae5e26ec70d4db35f24c8e2902d66af2291 (patch) | |
tree | 6e40edd439bd33fdd61e26ae58e384a966be94af /android | |
parent | 3fca2455ad8d9734d35c68333b14b104f3d5de5b (diff) | |
download | qtlocation-mapboxgl-bd0f5ae5e26ec70d4db35f24c8e2902d66af2291.tar.gz |
[android] Fix NullPointerException in editor mode
Fixes #2830
Diffstat (limited to 'android')
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 10 |
1 files changed, 8 insertions, 2 deletions
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 |