diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-07-28 19:21:35 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-07-28 19:21:47 +0200 |
| commit | 1a1d2e3fff5856dc9d1283b510a9f325c6fb8a93 (patch) | |
| tree | 2c16537e3321cde9ca9730f871f47ed32668e120 /src/plugins/position/android/src | |
| parent | 4e1008b4ac1eea776585ca41a6a3db127cf500ff (diff) | |
| parent | 75dd424e11964d8755abdb1b12b27a8479353b37 (diff) | |
| download | qtlocation-1a1d2e3fff5856dc9d1283b510a9f325c6fb8a93.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
Diffstat (limited to 'src/plugins/position/android/src')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/position/android/src/jnipositioning.cpp b/src/plugins/position/android/src/jnipositioning.cpp index 3ec772cd..e0124eb6 100644 --- a/src/plugins/position/android/src/jnipositioning.cpp +++ b/src/plugins/position/android/src/jnipositioning.cpp @@ -546,6 +546,11 @@ static bool registerNatives(JNIEnv *env) Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + typedef union { JNIEnv *nativeEnvironment; void *venv; diff --git a/src/plugins/position/android/src/qgeopositioninfosource_android.cpp b/src/plugins/position/android/src/qgeopositioninfosource_android.cpp index b24a6c96..488c1a70 100644 --- a/src/plugins/position/android/src/qgeopositioninfosource_android.cpp +++ b/src/plugins/position/android/src/qgeopositioninfosource_android.cpp @@ -111,7 +111,7 @@ void QGeoPositionInfoSourceAndroid::setPreferredPositioningMethods(QGeoPositionI int QGeoPositionInfoSourceAndroid::minimumUpdateInterval() const { - return 1000; + return 50; } QGeoPositionInfoSource::Error QGeoPositionInfoSourceAndroid::error() const diff --git a/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp b/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp index e7cd2e7d..f89f6663 100644 --- a/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp +++ b/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp @@ -90,7 +90,7 @@ void QGeoSatelliteInfoSourceAndroid::setUpdateInterval(int msec) int QGeoSatelliteInfoSourceAndroid::minimumUpdateInterval() const { - return 1000; + return 50; } QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSourceAndroid::error() const |