diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2012-03-13 23:59:53 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2012-03-13 23:59:53 +1000 |
| commit | d53847f585256956cd499f439be1538bd25606fb (patch) | |
| tree | d788595b4ec52723d88ec713624a06aec4aaa9ca | |
| parent | 145fe14917c85992b6a470962b30494b38748bf7 (diff) | |
| parent | 8c35dfa8e901c074e8f5e521bb1c6311084ef58b (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo:
Fix SystemInfo cell network info request logic on Symbian
| -rw-r--r-- | src/systeminfo/symbian/telephonyinfo_s60.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/systeminfo/symbian/telephonyinfo_s60.cpp b/src/systeminfo/symbian/telephonyinfo_s60.cpp index 45d8446055..942a2db36c 100644 --- a/src/systeminfo/symbian/telephonyinfo_s60.cpp +++ b/src/systeminfo/symbian/telephonyinfo_s60.cpp @@ -1324,7 +1324,12 @@ void CCellNetworkInfo::RunL() m_previousNetworkName = m_networkName; m_previousNetworkMode = m_networkMode; } - startMonitoring(); + + if (iStatus != KErrPermissionDenied) { + // NotifyCurrentNetworkChange requires ReadDeviceData so don't retry if app does not + // have required capabilities + startMonitoring(); + } TRACES(qDebug() << "CCellNetworkInfov2::RunL()--->"); } |