tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - cap width/height at maximum, don't throw exception. (#6788)

Browse Source
This commit is contained in:
Tobrun
2016-10-24 10:34:40 +02:00
committed by GitHub
parent eb1b385e50
commit bc4cf3220c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
View File

@@ -9,12 +9,14 @@ import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Surface;
import com.mapbox.mapboxsdk.annotations.Icon;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.Polygon;
import com.mapbox.mapboxsdk.annotations.Polyline;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.ProjectedMeters;
import com.mapbox.mapboxsdk.offline.OfflineManager;
@@ -151,13 +153,17 @@ final class NativeMapView {
}
if (width > 65535) {
throw new IllegalArgumentException(
"width cannot be greater than 65535.");
// we have seen edge cases where devices return incorrect values #6111
Log.e(MapboxConstants.TAG, "Device returned an out of range width size, " +
"capping value at 65535 instead of " + width);
width = 65535;
}
if (height > 65535) {
throw new IllegalArgumentException(
"height cannot be greater than 65535.");
// we have seen edge cases where devices return incorrect values #6111
Log.e(MapboxConstants.TAG, "Device returned an out of range height size, " +
"capping value at 65535 instead of " + height);
height = 65535;
}
nativeViewResize(nativeMapViewPtr, width, height);
}