From b2f277ac620cc41883dad8e06bb45458c18ffe72 Mon Sep 17 00:00:00 2001
From: Pablo Guardiola <guardiola31337@gmail.com>
Date: Thu, 1 Jun 2017 14:10:18 +0200
Subject: add null check in custom location engine activity to prevent null
 pointer exception (#9159)

---
 .../mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
index b87c723fda..b02b35b0d0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
@@ -63,7 +63,9 @@ public class MockLocationEngine extends LocationEngine {
 
   @Override
   public void removeLocationUpdates() {
-    handler.removeCallbacksAndMessages(null);
+    if (handler != null) {
+      handler.removeCallbacksAndMessages(null);
+    }
   }
 
   private Location getNextLocation() {
-- 
cgit v1.2.1