summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2017-06-06 09:21:18 +0200
committerGitHub <noreply@github.com>2017-06-06 09:21:18 +0200
commit0bd1b820f6cc5691df6a79e97160590bc5789519 (patch)
tree238e327d7fdae4fa6f59f4072aca77de471a4016
parent99e71fe63be275a5297262e645c1e7667f373722 (diff)
downloadqtlocation-mapboxgl-0bd1b820f6cc5691df6a79e97160590bc5789519.tar.gz
[android] - remove upgrade runtime exceptions (#9191)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java18
1 files changed, 2 insertions, 16 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 cf1841e180..19cad1d8e0 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
@@ -69,8 +69,6 @@ public class MapView extends FrameLayout {
private MapboxMap mapboxMap;
private MapCallback mapCallback;
- private boolean onStartCalled;
- private boolean onStopCalled;
private MapGestureDetector mapGestureDetector;
private MapKeyListener mapKeyListener;
@@ -242,7 +240,6 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void onStart() {
- onStartCalled = true;
mapboxMap.onStart();
ConnectivityReceiver.instance(getContext()).activate();
}
@@ -252,11 +249,7 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void onResume() {
- if (!onStartCalled) {
- // TODO: 26/10/16, can be removed after 5.0.0 release
- throw new IllegalStateException("MapView#onStart() was not called. "
- + "You must call this method from the parent's {@link Activity#onStart()} or {@link Fragment#onStart()}.");
- }
+ // replaced by onStart in v5.0.0
}
/**
@@ -264,7 +257,7 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void onPause() {
- // replaced by onStop in v5.0.0, keep around for future development
+ // replaced by onStop in v5.0.0
}
/**
@@ -272,7 +265,6 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void onStop() {
- onStopCalled = true;
mapboxMap.onStop();
ConnectivityReceiver.instance(getContext()).deactivate();
}
@@ -282,12 +274,6 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void onDestroy() {
- if (!onStopCalled) {
- // TODO: 26/10/16, can be removed after 5.0.0 release
- throw new IllegalStateException("MapView#onStop() was not called. "
- + "You must call this method from the parent's {@link Activity#onStop()} or {@link Fragment#onStop()}.");
- }
-
destroyed = true;
nativeMapView.terminateContext();
nativeMapView.terminateDisplay();