diff options
| author | Steve Block <steveblock@google.com> | 2010-02-19 08:42:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-19 08:42:12 -0800 |
| commit | 7129a1df279021976923fecf0ca2a1c3ae119909 (patch) | |
| tree | 428bb07d896a5bb94b001251ca4c16fc6a69dd44 | |
| parent | 8ff99dc8bb0a50c117e493be7f1fba4668c2cf91 (diff) | |
| parent | 032802d7bdd58f0165721ecf815eef6d3bfc0863 (diff) | |
| download | external_webkit-7129a1df279021976923fecf0ca2a1c3ae119909.zip external_webkit-7129a1df279021976923fecf0ca2a1c3ae119909.tar.gz external_webkit-7129a1df279021976923fecf0ca2a1c3ae119909.tar.bz2 | |
Merge "Fixes a crash in the Geolocation service when using maximumAge"
| -rw-r--r-- | WebCore/platform/android/GeolocationServiceAndroid.cpp | 8 |
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 |