summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-09-19 13:34:04 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-09-19 16:05:18 (GMT)
commitd04f37fa73d2fbb78dd85a02e9d3180ed4ddbdab (patch)
tree8a08870b380b15b678927fef9cab5a350508cbec /src/plugins/bearer
parentada33b11092f278ae4f1280a6da07ffd151a31b6 (diff)
downloadQt-d04f37fa73d2fbb78dd85a02e9d3180ed4ddbdab.zip
Qt-d04f37fa73d2fbb78dd85a02e9d3180ed4ddbdab.tar.gz
Qt-d04f37fa73d2fbb78dd85a02e9d3180ed4ddbdab.tar.bz2
symbian bearer: fix tst_qnetworksession test failures
Symbian is not reporting the expected KLinkLayerClosed event on the last RConnection handle. Instead, it reports the event KConfigDaemonFinishedDeregistrationStop, which indicates the nif plugin is being destroyed (this is followed by unload events) To fix, this event is treated the same as a link down event, and results in the state change to disconnected. Either there has been a behaviour change in the platform, or the test was previously run with another user of the API running in the background (e.g. WLAN wizard, connection monitor) which prevented the unload. Task-Number: QTBUG-21382 Reviewed-By: mread (cherry picked from commit a0ad54acd33873316908080f432768fdf3e3bfc2)
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r--src/plugins/bearer/symbian/qnetworksession_impl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 5514511..29f0637 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -1438,6 +1438,9 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
newState(QNetworkSession::Closing,accessPointId);
break;
+ // Connection stopped
+ case KConfigDaemonFinishedDeregistrationStop: //this comes if this is the last session, instead of KLinkLayerClosed
+ case KConfigDaemonFinishedDeregistrationPreserve:
// Connection closed
case KConnectionClosed:
case KLinkLayerClosed: