2 files changed, 30 insertions, 2 deletions
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
index 782d515..9340053 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -51,6 +51,7 @@ public:
     ~GeolocationServiceBridge();
 
     void start();
+    void stop();
     void setEnableGps(bool enable);
 
     // Static wrapper functions to hide JNI nastiness.
@@ -110,6 +111,7 @@ GeolocationServiceBridge::GeolocationServiceBridge(ListenerInterface* listener)
 
 GeolocationServiceBridge::~GeolocationServiceBridge()
 {
+    stop();
     stopJavaImplementation();
 }
 
@@ -120,6 +122,13 @@ void GeolocationServiceBridge::start()
                                 javaGeolocationServiceClassMethodIDs[GEOLOCATION_SERVICE_METHOD_START]);
 }
 
+void GeolocationServiceBridge::stop()
+{
+    ASSERT(m_javaGeolocationServiceObject);
+    getJNIEnv()->CallVoidMethod(m_javaGeolocationServiceObject,
+                                javaGeolocationServiceClassMethodIDs[GEOLOCATION_SERVICE_METHOD_STOP]);
+}
+
 void GeolocationServiceBridge::setEnableGps(bool enable)
 {
     ASSERT(m_javaGeolocationServiceObject);
@@ -254,8 +263,6 @@ void GeolocationServiceBridge::stopJavaImplementation()
 {
     // Called by GeolocationServiceAndroid on WebKit thread.
     ASSERT(m_javaGeolocationServiceObject);
-    getJNIEnv()->CallVoidMethod(m_javaGeolocationServiceObject,
-                                javaGeolocationServiceClassMethodIDs[GEOLOCATION_SERVICE_METHOD_STOP]);
     getJNIEnv()->DeleteGlobalRef(m_javaGeolocationServiceObject);
 }
 
@@ -322,6 +329,24 @@ void GeolocationServiceAndroid::stopUpdating()
     m_lastError = 0;
 }
 
+void GeolocationServiceAndroid::suspend()
+{
+    // If the Geolocation object has called stopUpdating, and hence the bridge
+    // object has been destroyed, we should not receive calls to this method
+    // until startUpdating is called again and the bridge is recreated.
+    ASSERT(m_javaBridge);
+    m_javaBridge->stop();
+}
+
+void GeolocationServiceAndroid::resume()
+{
+    // If the Geolocation object has called stopUpdating, and hence the bridge
+    // object has been destroyed, we should not receive calls to this method
+    // until startUpdating is called again and the bridge is recreated.
+    ASSERT(m_javaBridge);
+    m_javaBridge->start();
+}
+
 // Note that there is no guarantee that subsequent calls to this method offer a
 // more accurate or updated position.
 void GeolocationServiceAndroid::newPositionAvailable(PassRefPtr<Geoposition> position)
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.h b/WebCore/platform/android/GeolocationServiceAndroid.h
index 90a8864..e8ed7ce 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.h
+++ b/WebCore/platform/android/GeolocationServiceAndroid.h
@@ -52,6 +52,9 @@ namespace WebCore {
         virtual Geoposition* lastPosition() const { return m_lastPosition.get(); }
         virtual PositionError* lastError() const { return m_lastError.get(); }
 
+        virtual void suspend();
+        virtual void resume();
+
         // Android-specific
         void newPositionAvailable(PassRefPtr<Geoposition>);
         void newErrorAvailable(PassRefPtr<PositionError>);