whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix connman QNetworkConfiguration Discovered 

Make Discovered depend on autoconnectable service

This stops seemingly automatic use of a non autconnectable service,
and allows the connection dialog to popup.

Change-Id: Idea9a22eb4bbfb4fefeca7867526a2ddc3954376
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
bb10
Lorn Potter 2013-10-18 05:29:25 +10:00 committed by The Qt Project
parent c28763d83c
commit 1db89eb5a4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/bearer/connman/qconnmanengine.cpp
View File

@ -416,21 +416,23 @@ QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QStri
QMutexLocker locker(&mutex);
QConnmanServiceInterface serv(service);
QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined;
if( serv.getType() == "cellular") {
if(serv.isSetupRequired()) {
if (serv.getType() == "cellular") {
if (serv.isSetupRequired() || !serv.isAutoConnect()) {
flag = ( flag | QNetworkConfiguration::Defined);
} else {
flag = ( flag | QNetworkConfiguration::Discovered);
}
} else {
if(serv.isFavorite()) {
flag = ( flag | QNetworkConfiguration::Discovered);
if (serv.isFavorite()) {
if (serv.isAutoConnect()) {
flag = ( flag | QNetworkConfiguration::Discovered);
}
} else {
flag = QNetworkConfiguration::Undefined;
}
}
if(serv.getState() == "ready" || serv.getState() == "online") {
if (serv.getState() == "ready" || serv.getState() == "online") {
flag = ( flag | QNetworkConfiguration::Active);
}