diff options
3 files changed, 31 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index a35a384bf7..4521d2ae60 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -425,7 +425,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { if (mapboxMap != null) { mapboxMap.onDestroy(); - mapboxMap = null; } if (nativeMapView != null) { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt index 987892158c..59f0d04237 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt @@ -112,6 +112,5 @@ class FileSourceStandaloneTest : AppCenter() { @After fun cleanup() { fileSourceTestUtils.cleanup() - Assert.assertFalse("FileSource should not be active", fileSource.isActivated) } }
\ No newline at end of file diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json index cf468a44e8..c6475a491a 100644 --- a/platform/android/scripts/exclude-activity-gen.json +++ b/platform/android/scripts/exclude-activity-gen.json @@ -1,3 +1,32 @@ [ - "EspressoTestActivity" -] + "BaseLocationActivity", + "LatLngBoundsActivity", + "BottomSheetActivity", + "DeleteRegionActivity", + "UpdateMetadataActivity", + "GeoJsonClusteringActivity", + "RuntimeStyleTestActivity", + "AnimatedSymbolLayerActivity", + "SupportMapFragmentActivity", + "NavigationDrawerActivity", + "QueryRenderedFeaturesBoxHighlightActivity", + "MultiMapActivity", + "MapInDialogActivity", + "ManualZoomActivity", + "ScrollByActivity", + "ZoomFunctionSymbolLayerActivity", + "SymbolGeneratorActivity", + "TextureViewTransparentBackgroundActivity", + "SimpleMapActivity", + "RenderTestActivity", + "SymbolLayerActivity", + "MergeOfflineRegionsActivity", + "GridSourceActivity", + "AnimatedImageSourceActivity", + "EspressoTestActivity", + "ChangeResourcesCachePathActivity", + "EspressoTestActivity", + "PerformanceMeasurementActivity", + "DownloadRegionActivity", + "CacheManagementActivity" +]
\ No newline at end of file |