--- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Fri Mar 12 15:48:51 2010 +0200
+++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Mon Mar 15 12:44:50 2010 +0200
@@ -23,7 +23,7 @@
//System Includes
#include <bldvariant.hrh>
-
+#include <browser_platform_variant.hrh>
#include <ApAccessPointItem.h>
#include <VpnAPEngine.h>
#include <AknNotifyStd.h>
@@ -207,6 +207,8 @@
User::LeaveIfError( iConnection.GetDesSetting( query, val ) );
iConnName = val.AllocL();
+ CLOG_WRITE_1( "Iap id used : %d", iapId );
+ CLOG_WRITE_1( "Conn name : %S", iConnName);
}
else if( !iRequestedAPIds.iFirstPreference )
{
@@ -582,7 +584,11 @@
TApBearerType CInternetConnectionManager::BearerTypeL( TUint32 aIAPId )
{
TApBearerType apbearerType = EApBearerTypeAllBearers;
- if( iSilentMode || !iRequestedAPIds.iFirstPreference )
+#ifdef BRDO_OCC_ENABLED_FF
+ if( !iRequestedAPIds.iFirstPreference )
+#else
+ if( iSilentMode || !iRequestedAPIds.iFirstPreference )
+#endif
// Temp fix for CDMA
{
return EApBearerTypeAllBearers;
@@ -643,7 +649,12 @@
CLOG_ENTERFN( "StopConnectionL()" );
StopConnectionObserving();
- iConnection.Close();
+ if( iConnected )
+ {
+ CLOG_WRITE( "StopConnectionL() Stop the Connection" );
+ iConnection.Stop(RConnection::EStopAuthoritative);
+ }
+
// iServ.Close();
iConnected = EFalse;
iEasyWlan = EFalse;