From 8e01f52dd212c57646a9b0fa1c65039a003b78cc Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Tue, 12 Sep 2017 09:34:09 +0200 Subject: [android] - don't recycle bitmap for icon reuse. --- .../src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java index affbf48267..b1d6df2103 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.Bitmap; -import android.os.Build; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.annotations.Icon; @@ -143,7 +142,7 @@ class IconManager { } } - public void iconCleanup(Icon icon) { + void iconCleanup(Icon icon) { int refCounter = iconMap.get(icon) - 1; if (refCounter == 0) { remove(icon); @@ -155,18 +154,10 @@ class IconManager { private void remove(Icon icon) { nativeMapView.removeAnnotationIcon(icon.getId()); iconMap.remove(icon); - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - recycleBitmap(icon.getBitmap()); - } } private void updateIconRefCounter(Icon icon, int refCounter) { iconMap.put(icon, refCounter); } - private void recycleBitmap(Bitmap bitmap) { - if (!bitmap.isRecycled()) { - bitmap.recycle(); - } - } } -- cgit v1.2.1