[-]
[+]
|
Changed |
_service:tar_git:geoclue-provider-hybris.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:geoclue-providers-hybris.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -1,7 +1,9 @@
<services>
<service name="tar_git">
- <param name="url">https://github.com/mer-hybris/geoclue-providers-hybris.git</param>
- <param name="branch">master</param>
- <param name="revision">HEAD</param>
- </service>
-</services>
+ <param name="url">https://github.com/mer-hybris/geoclue-providers-hybris.git</param>
+ <param name="branch">master</param>
+ <param name="revision">e4cc0435862f72dd140c3b88c5e5c714cfead826</param>
+ <param name="token"/>
+ <param name="debian">N</param>
+ <param name="dumb">N</param>
+</service></services>
|
[-]
[+]
|
Changed |
_service:tar_git:geoclue-provider-hybris-0.2.20.tar.gz/hybrisprovider.cpp
^
|
@@ -61,6 +61,7 @@
const QString LocationSettingsDir = QStringLiteral("/etc/location/");
const QString LocationSettingsFile = QStringLiteral("/etc/location/location.conf");
const QString LocationSettingsEnabledKey = QStringLiteral("location/enabled");
+const QString LocationSettingsAllowedDataSourcesGpsKey = QStringLiteral("allowed_data_sources/gps");
const QString LocationSettingsGpsEnabledKey = QStringLiteral("location/gps/enabled");
const QString LocationSettingsAgpsEnabledKey = QStringLiteral("location/%1/enabled");
const QString LocationSettingsAgpsOnlineEnabledKey = QStringLiteral("location/%1/online_enabled");
@@ -285,6 +286,8 @@
m_locationSettings = settings;
connect(m_locationSettings, &LocationSettings::locationEnabledChanged,
this, &HybrisProvider::locationEnabledChanged);
+ connect(m_locationSettings, &LocationSettings::allowedDataSourcesChanged,
+ this, &HybrisProvider::locationEnabledChanged);
connect(m_locationSettings, &LocationSettings::gpsEnabledChanged,
this, &HybrisProvider::locationEnabledChanged);
connect(m_locationSettings, &LocationSettings::gpsFlightModeChanged,
@@ -1055,11 +1058,12 @@
m_agpsOnlineEnabled = (m_locationSettings->hereAvailable() && m_locationSettings->hereState() == LocationSettings::OnlineAGpsEnabled)
|| (m_locationSettings->mlsAvailable() && m_locationSettings->mlsOnlineState() == LocationSettings::OnlineAGpsEnabled);
- // enable GPS positioning if location and the GPS are enabled, and the GPS is not in flight mode.
+ // enable GPS positioning if location and the GPS are enabled, and the GPS is not in flight mode - if it is allowed by MDM.
return m_locationSettings->locationEnabled()
&& m_locationSettings->gpsAvailable()
&& m_locationSettings->gpsEnabled()
- && !m_locationSettings->gpsFlightMode();
+ && !m_locationSettings->gpsFlightMode()
+ && (m_locationSettings->allowedDataSources() & LocationSettings::GpsData);
}
quint32 HybrisProvider::minimumRequestedUpdateInterval() const
|
[-]
[+]
|
Changed |
_service:tar_git:geoclue-providers-hybris.inc
^
|
@@ -12,7 +12,7 @@
BuildRequires: pkgconfig(connman-qt5) >= 1.0.68
BuildRequires: pkgconfig(qofono-qt5)
BuildRequires: pkgconfig(qofonoext)
-BuildRequires: pkgconfig(systemsettings)
+BuildRequires: pkgconfig(systemsettings) >= 0.5.5
Requires: connectionagent-qt5 >= 0.9.20
Source100: geoclue-providers-hybris.inc
|