Changes of Revision 8
[-] [+] | Changed | _service:tar_git:geoclue-provider-hybris.changes |
[-] [+] | Changed | _service:tar_git:geoclue-providers-hybris.spec ^ |
[-] [+] | Changed | _service ^ |
@@ -2,7 +2,7 @@ <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">d58024271c8152914464fe854d28ade8cc3d32ff</param> + <param name="revision">e7cdad2c92c13041026c05babcb5b3c435100733</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> | ||
[-] [+] | Changed | _service:tar_git:geoclue-provider-hybris-0.2.16.tar.gz/hybrisprovider.cpp ^ |
@@ -575,21 +575,21 @@ if (m_xtraServers.isEmpty()) { QFile gpsConf(QStringLiteral("/system/etc/gps.conf")); - if (!gpsConf.open(QIODevice::ReadOnly)) - return; + if (gpsConf.open(QIODevice::ReadOnly)) { - while (!gpsConf.atEnd()) { - const QByteArray line = gpsConf.readLine().trimmed(); - if (line.startsWith('#')) - continue; + while (!gpsConf.atEnd()) { + const QByteArray line = gpsConf.readLine().trimmed(); + if (line.startsWith('#')) + continue; - const QList<QByteArray> split = line.split('='); - if (split.length() != 2) - continue; + const QList<QByteArray> split = line.split('='); + if (split.length() != 2) + continue; - const QByteArray key = split.at(0).trimmed(); - if (key == "XTRA_SERVER_1" || key == "XTRA_SERVER_2" || key == "XTRA_SERVER_3") - m_xtraServers.enqueue(QUrl::fromEncoded(split.at(1).trimmed())); + const QByteArray key = split.at(0).trimmed(); + if (key == "XTRA_SERVER_1" || key == "XTRA_SERVER_2" || key == "XTRA_SERVER_3") + m_xtraServers.enqueue(QUrl::fromEncoded(split.at(1).trimmed())); + } } } | ||
[-] [+] | Changed | _service:tar_git:geoclue-provider-hybris-0.2.16.tar.gz/main.cpp ^ |
@@ -55,6 +55,21 @@ supplementaryGroups[numberGroups++] = group->gr_gid; + // remove audio, radio and bluetooth groups to avoid confusion in BSP + char *groups_to_remove[] = {"bluetooth", "radio", "audio", NULL}; + + int idx = 0; + while (groups_to_remove[idx]) { + group = getgrnam(groups_to_remove[idx]); + idx++; + + if (idx + 1 < numberGroups) { + memmove((void*)&supplementaryGroups[idx], (void*)&supplementaryGroups[idx + 1], (numberGroups - idx - 1) * sizeof(gid_t)); + } + + numberGroups--; + } + #if GEOCLUE_ANDROID_GPS_INTERFACE >= 2 group = getgrnam("net_raw"); if (group) { |