summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-11-10 06:49:08 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2017-11-10 06:49:08 +0100
commit5fe55ecac2c9c55b34017670cbf16fcf2a3cb7a1 (patch)
tree3fe9a4d375eaaefc88c5aa94e83b781fe597aa88
parent0bcba769ba0cc1022733ce568c6d40670f441493 (diff)
downloadqtlocation-mapboxgl-5fe55ecac2c9c55b34017670cbf16fcf2a3cb7a1.tar.gz
[android] - fixup animated marker test activity from monkey runs
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
index 52181cee0c..d8752bbea2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
@@ -236,12 +236,14 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
stopped = true;
- // Stop ongoing animations, prevent memory lekas
- MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
- for (MarkerView markerView : markerViews) {
- View view = markerViewManager.getView(markerView);
- if (view != null) {
- view.animate().cancel();
+ // Stop ongoing animations, prevent memory leaks
+ if (mapboxMap != null) {
+ MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
+ for (MarkerView markerView : markerViews) {
+ View view = markerViewManager.getView(markerView);
+ if (view != null) {
+ view.animate().cancel();
+ }
}
}