Merge "Fixes a crash in the Geolocation service when using maximumAge"
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
index aaa7af7..61043fb 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -115,14 +115,14 @@
void GeolocationServiceAndroid::suspend()
{
- ASSERT(m_javaBridge);
- m_javaBridge->stop();
+ if (m_javaBridge)
+ m_javaBridge->stop();
}
void GeolocationServiceAndroid::resume()
{
- ASSERT(m_javaBridge);
- m_javaBridge->start();
+ if (m_javaBridge)
+ m_javaBridge->start();
}
// Note that there is no guarantee that subsequent calls to this method offer a
