equal
deleted
inserted
replaced
129 iap ) |
129 iap ) |
130 iChooseIapPref.SetIapId( iap ); |
130 iChooseIapPref.SetIapId( iap ); |
131 iChooseIapPref.SetSnapId( 0 ); |
131 iChooseIapPref.SetSnapId( 0 ); |
132 } |
132 } |
133 |
133 |
134 MPMLOGSTRING2( "CMPMIapSelection::ChooseIapL: IapID: %i", |
134 MPMLOGSTRING3( "CMPMIapSelection::ChooseIapL: IapID: %i SnapId: %i", |
135 iChooseIapPref.IapId() ) |
135 iChooseIapPref.IapId(), iChooseIapPref.SnapId() ) |
136 |
136 |
137 // Update WLAN only information and whether new WLAN network usage is allowed. |
137 // Update WLAN only information and whether new WLAN network usage is allowed. |
138 TBool wlanOnly = iSession->IsWlanOnlyL( iNewWlansAllowed ); |
138 TBool wlanOnly = iSession->IsWlanOnlyL( iNewWlansAllowed ); |
139 |
139 |
140 // Check if direct IAP connection is tried to make |
140 // Check if direct IAP connection is tried to make |
480 ChooseBestIAPL( iChooseIapPref, availableIAPList, iNextBestExists ); |
480 ChooseBestIAPL( iChooseIapPref, availableIAPList, iNextBestExists ); |
481 TUint32 validateIapId = iChooseIapPref.IapId(); |
481 TUint32 validateIapId = iChooseIapPref.IapId(); |
482 // Check if any suitable IAP's were found, if not then complete selection with error code |
482 // Check if any suitable IAP's were found, if not then complete selection with error code |
483 if ( validateIapId == 0 ) |
483 if ( validateIapId == 0 ) |
484 { |
484 { |
485 if ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault ) |
485 if ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault || |
|
486 ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeExplicit && |
|
487 !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
|
488 iCommsDatAccess->IsInternetSnapL( 0, snap ) ) ) |
486 { |
489 { |
487 ImplicitConnectionL(); |
490 ImplicitConnectionL(); |
488 } |
491 } |
489 else |
492 else |
490 { |
493 { |