summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-06-04 13:00:15 +0200
committerŁukasz Paczos <lukas.paczos@gmail.com>2019-06-04 15:05:29 +0200
commiteb43d1f13390b3edc1ebb7115b5f98325ff0d1d9 (patch)
tree28a2a1a41a1756e0bfd652aa87e91056c125b13d /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
parent892699a39a7fb569a8536f96d2eecc89d0a4e904 (diff)
downloadqtlocation-mapboxgl-eb43d1f13390b3edc1ebb7115b5f98325ff0d1d9.tar.gz
[android] reset the native renderer only when the GL thread exitsupstream/lp-detach-gl-thread
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java')
-rwxr-xr-xplatform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 3980790fd1..4e774d9f2c 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -532,7 +532,7 @@ final class NativeMapView implements NativeMap {
@Override
@NonNull
public long[] queryPointAnnotations(RectF rect) {
- if (checkState("queryPointAnnotations") || !mapRenderer.hasSurface()) {
+ if (checkState("queryPointAnnotations")) {
return new long[] {};
}
return nativeQueryPointAnnotations(rect);
@@ -541,7 +541,7 @@ final class NativeMapView implements NativeMap {
@Override
@NonNull
public long[] queryShapeAnnotations(RectF rectF) {
- if (checkState("queryShapeAnnotations") || !mapRenderer.hasSurface()) {
+ if (checkState("queryShapeAnnotations")) {
return new long[] {};
}
return nativeQueryShapeAnnotations(rectF);
@@ -573,7 +573,7 @@ final class NativeMapView implements NativeMap {
@Override
public void onLowMemory() {
- if (checkState("onLowMemory") || !mapRenderer.hasSurface()) {
+ if (checkState("onLowMemory")) {
return;
}
nativeOnLowMemory();
@@ -890,7 +890,7 @@ final class NativeMapView implements NativeMap {
public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates,
@Nullable String[] layerIds,
@Nullable Expression filter) {
- if (checkState("queryRenderedFeatures") || !mapRenderer.hasSurface()) {
+ if (checkState("queryRenderedFeatures")) {
return new ArrayList<>();
}
Feature[] features = nativeQueryRenderedFeaturesForPoint(coordinates.x / pixelRatio,
@@ -903,7 +903,7 @@ final class NativeMapView implements NativeMap {
public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates,
@Nullable String[] layerIds,
@Nullable Expression filter) {
- if (checkState("queryRenderedFeatures") || !mapRenderer.hasSurface()) {
+ if (checkState("queryRenderedFeatures")) {
return new ArrayList<>();
}
Feature[] features = nativeQueryRenderedFeaturesForBox(