1 files changed, 24 insertions, 5 deletions

diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index 797c30c7c6..adefb7504e 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -186,10 +186,23 @@ void QConnmanEngine::connectToId(const QString &id)
 
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
 
-    if (!serv->isValid()) {
+    if (!serv || !serv->isValid()) {
         emit connectionError(id, QBearerEngineImpl::InterfaceLookupError);
     } else {
-        serv->connect();
+        if (serv->type() == QLatin1String("cellular")) {
+            if (serv->roaming()) {
+                if (!isRoamingAllowed(serv->path())) {
+                    emit connectionError(id, QBearerEngineImpl::OperationNotSupported);
+                    return;
+                }
+                if (isAlwaysAskRoaming()) {
+                    emit connectionError(id, QBearerEngineImpl::OperationNotSupported);
+                    return;
+                }
+            }
+        }
+        if (serv->autoConnect())
+            serv->connect();
     }
 }
 
@@ -198,7 +211,7 @@ void QConnmanEngine::disconnectFromId(const QString &id)
     QMutexLocker locker(&mutex);
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
 
-    if (!serv->isValid()) {
+    if (!serv || !serv->isValid()) {
         emit connectionError(id, DisconnectionError);
     } else {
         serv->disconnect();
@@ -250,6 +263,8 @@ QNetworkSession::State QConnmanEngine::sessionStateForId(const QString &id)
 
     QString service = id;
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service);
+    if (!serv)
+        return QNetworkSession::Invalid;
 
     QString servState = serv->state();
 
@@ -355,6 +370,8 @@ void QConnmanEngine::serviceStateChanged(const QString &state)
 
 void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv)
 {
+    if (!serv)
+        return;
     QMutexLocker locker(&mutex);
     QString id = serv->path();
 
@@ -396,8 +413,10 @@ QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QStri
 {
     QMutexLocker locker(&mutex);
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service);
-    QString state = serv->state();
+    if (!serv)
+        return QNetworkConfiguration::Undefined;
 
+    QString state = serv->state();
     QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined;
 
     if (serv->type() == QLatin1String("cellular")) {
@@ -494,7 +513,7 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
 {
     QMutexLocker locker(&mutex);
     if (!connmanServiceInterfaces.contains(servicePath)) {
-        QConnmanServiceInterface *serv = new QConnmanServiceInterface(servicePath);
+        QConnmanServiceInterface *serv = new QConnmanServiceInterface(servicePath, this);
         connmanServiceInterfaces.insert(serv->path(),serv);
     }