summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-09-12 09:34:09 +0200
committerTobrun <tobrun@mapbox.com>2017-09-12 10:18:24 +0200
commit8e01f52dd212c57646a9b0fa1c65039a003b78cc (patch)
tree94ce7bbba421987de9b42b6ccbc6550850232856
parent738f68251a33f0ada108b7d723bc73406490e894 (diff)
downloadqtlocation-mapboxgl-8e01f52dd212c57646a9b0fa1c65039a003b78cc.tar.gz
[android] - don't recycle bitmap for icon reuse.
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java11
1 files changed, 1 insertions, 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();
- }
- }
}