equal
deleted
inserted
replaced
21 |
21 |
22 //INCLUDE FILES |
22 //INCLUDE FILES |
23 |
23 |
24 //System Includes |
24 //System Includes |
25 #include <bldvariant.hrh> |
25 #include <bldvariant.hrh> |
26 |
26 #include <browser_platform_variant.hrh> |
27 #include <ApAccessPointItem.h> |
27 #include <ApAccessPointItem.h> |
28 #include <VpnAPEngine.h> |
28 #include <VpnAPEngine.h> |
29 #include <AknNotifyStd.h> |
29 #include <AknNotifyStd.h> |
30 #include <AknGlobalNote.h> |
30 #include <AknGlobalNote.h> |
31 #include <e32std.h> |
31 #include <e32std.h> |
205 |
205 |
206 query.Format(_L("%s\\%s"), IAP, COMMDB_NAME); |
206 query.Format(_L("%s\\%s"), IAP, COMMDB_NAME); |
207 User::LeaveIfError( iConnection.GetDesSetting( query, val ) ); |
207 User::LeaveIfError( iConnection.GetDesSetting( query, val ) ); |
208 |
208 |
209 iConnName = val.AllocL(); |
209 iConnName = val.AllocL(); |
|
210 CLOG_WRITE_1( "Iap id used : %d", iapId ); |
|
211 CLOG_WRITE_1( "Conn name : %S", iConnName); |
210 } |
212 } |
211 else if( !iRequestedAPIds.iFirstPreference ) |
213 else if( !iRequestedAPIds.iFirstPreference ) |
212 { |
214 { |
213 TBuf<20> query; |
215 TBuf<20> query; |
214 TBuf<40> val; |
216 TBuf<40> val; |
580 //CInternetConnectionManager::BearerTypeL |
582 //CInternetConnectionManager::BearerTypeL |
581 //-------------------------------------------------------------------------- |
583 //-------------------------------------------------------------------------- |
582 TApBearerType CInternetConnectionManager::BearerTypeL( TUint32 aIAPId ) |
584 TApBearerType CInternetConnectionManager::BearerTypeL( TUint32 aIAPId ) |
583 { |
585 { |
584 TApBearerType apbearerType = EApBearerTypeAllBearers; |
586 TApBearerType apbearerType = EApBearerTypeAllBearers; |
585 if( iSilentMode || !iRequestedAPIds.iFirstPreference ) |
587 #ifdef BRDO_OCC_ENABLED_FF |
|
588 if( !iRequestedAPIds.iFirstPreference ) |
|
589 #else |
|
590 if( iSilentMode || !iRequestedAPIds.iFirstPreference ) |
|
591 #endif |
586 // Temp fix for CDMA |
592 // Temp fix for CDMA |
587 { |
593 { |
588 return EApBearerTypeAllBearers; |
594 return EApBearerTypeAllBearers; |
589 } |
595 } |
590 |
596 |
641 EXPORT_C void CInternetConnectionManager::StopConnectionL() |
647 EXPORT_C void CInternetConnectionManager::StopConnectionL() |
642 { |
648 { |
643 CLOG_ENTERFN( "StopConnectionL()" ); |
649 CLOG_ENTERFN( "StopConnectionL()" ); |
644 |
650 |
645 StopConnectionObserving(); |
651 StopConnectionObserving(); |
646 iConnection.Close(); |
652 if( iConnected ) |
|
653 { |
|
654 CLOG_WRITE( "StopConnectionL() Stop the Connection" ); |
|
655 iConnection.Stop(RConnection::EStopAuthoritative); |
|
656 } |
|
657 |
647 // iServ.Close(); |
658 // iServ.Close(); |
648 iConnected = EFalse; |
659 iConnected = EFalse; |
649 iEasyWlan = EFalse; |
660 iEasyWlan = EFalse; |
650 |
661 |
651 if( !iSilentMode ) |
662 if( !iSilentMode ) |