diff options
author | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-07 11:31:09 +0200 |
---|---|---|
committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-17 10:24:09 +0200 |
commit | 0a5e227ad9c6bfc18c20969e5e10b8b21feb0040 (patch) | |
tree | 19b37b26e9fa7f15c84f889d8688939d7748baf2 /src/plugins/position/android/src/jnipositioning.h | |
parent | c6d1e0b5b7a264b17c9c6a27afbacdbaa5aec339 (diff) | |
download | qtlocation-0a5e227ad9c6bfc18c20969e5e10b8b21feb0040.tar.gz |
QtPositioning: use new permissions API in android plugin
This patch introduces the usage of the new public permissions API.
It allows to remove the dependency on the private JNI-related headers.
As a drive-by: do a small clean-up for the included headers.
Task-number: QTBUG-92475
Change-Id: I9e3580903c68361b160da86e4fe117d46da250e1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/position/android/src/jnipositioning.h')
-rw-r--r-- | src/plugins/position/android/src/jnipositioning.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/position/android/src/jnipositioning.h b/src/plugins/position/android/src/jnipositioning.h index 4d972d08..a9a72ecb 100644 --- a/src/plugins/position/android/src/jnipositioning.h +++ b/src/plugins/position/android/src/jnipositioning.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtPositioning module of the Qt Toolkit. @@ -40,14 +40,9 @@ #ifndef JNIPOSITIONING_H #define JNIPOSITIONING_H -#include <jni.h> #include <QGeoPositionInfoSource> #include <QGeoSatelliteInfoSource> -/* - Note: all the exception handling is done on the Java side, so we do not need - to care about Java exceptions on the C++ side. -*/ namespace AndroidPositioning { int registerPositionInfoSource(QObject *obj); @@ -63,7 +58,7 @@ namespace AndroidPositioning QGeoSatelliteInfoSource::Error startSatelliteUpdates(int androidClassKey, bool isSingleRequest, int updateRequestTimeout); - bool requestionPositioningPermissions(JNIEnv *env); + bool requestionPositioningPermissions(); } #endif // JNIPOSITIONING_H |