Fixes a crash in the Geolocation service when using maximumAge

When a browser page is put to the background, the Geolocation object is
suspended. If the Geolocation object has active requests, it suspends its
Geolocation service.

Now that we have maximum age support, the Geolocation object can have active
requests without having started its Geolocation service. In this case, the
geolocation service can ignore calls to suspend and resume.

This avoids a crash when the Android Geolocation service hasn't created it's
java bridge when suspend is called.

Bug: 2453611
Change-Id: I368226281920512584a92b5f1967d602df1f0782

1 files changed, 4 insertions, 4 deletions

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::stopUpdating()
 
 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