equal
deleted
inserted
replaced
95 __CFLOG_VAR((KS60TierMgrTag, KS60TierMgrSubTag, _L8("S60MCPR::CSimpleS60SelectorBase %08x::\tSelectL() Using Default AP:%d"),this,iDefaultAp)); |
95 __CFLOG_VAR((KS60TierMgrTag, KS60TierMgrSubTag, _L8("S60MCPR::CSimpleS60SelectorBase %08x::\tSelectL() Using Default AP:%d"),this,iDefaultAp)); |
96 |
96 |
97 //Legacy Attach -case handling is in NetMCPR and IPProtoTM |
97 //Legacy Attach -case handling is in NetMCPR and IPProtoTM |
98 // 399 Attach is not supported |
98 // 399 Attach is not supported |
99 const TConnPref& prefs = iSelectionPrefs.Prefs(); |
99 const TConnPref& prefs = iSelectionPrefs.Prefs(); |
|
100 iSubSessionUniqueId = iSelectionPrefs.SubSessionUniqueId(); |
|
101 |
100 switch ( prefs.ExtensionId() ) |
102 switch ( prefs.ExtensionId() ) |
101 { |
103 { |
102 case TConnPref::EConnPrefCommDbMulti: |
104 case TConnPref::EConnPrefCommDbMulti: |
103 { |
105 { |
104 // Sanity check. |
106 // Sanity check. |
128 // Unsupported |
130 // Unsupported |
129 User::Leave( KErrNotSupported ); |
131 User::Leave( KErrNotSupported ); |
130 break; |
132 break; |
131 } |
133 } |
132 } |
134 } |
133 // We do the default behavior. AP is only needed to get proper UIds for TM etc.. |
135 // We use default AP always. If some variation is needed in APs, then |
134 // TODO: change to use AP. |
136 // this must be changed to use specific APs instead of the default one. |
135 aSelectionNotify.SelectComplete( this, FindOrCreateProviderL( iDefaultAp )); |
137 aSelectionNotify.SelectComplete( this, FindOrCreateProviderL( iDefaultAp )); |
136 aSelectionNotify.SelectComplete( this, NULL ); |
138 aSelectionNotify.SelectComplete( this, NULL ); |
137 } |
139 } |
138 |
140 |
139 // ----------------------------------------------------------------------------- |
141 // ----------------------------------------------------------------------------- |
162 |
164 |
163 CleanupStack::PushL( provider ); |
165 CleanupStack::PushL( provider ); |
164 |
166 |
165 // Provision selection preferences to S60 NetMCPR. |
167 // Provision selection preferences to S60 NetMCPR. |
166 prov->SetSelectionPrefs( iSelectionPrefs ); |
168 prov->SetSelectionPrefs( iSelectionPrefs ); |
|
169 prov->SetSubSessionUniqueId( iSubSessionUniqueId ); |
167 |
170 |
168 // Change the provider info so that this provider is never found by other selections |
171 // Change the provider info so that this provider is never found by other selections |
169 const TProviderInfo& pi = provider->ProviderInfo(); |
172 const TProviderInfo& pi = provider->ProviderInfo(); |
170 provider->SetProviderInfo( TProviderInfo( pi.TierId(), pi.APId(), provider )); //This provider will never be found |
173 provider->SetProviderInfo( TProviderInfo( pi.TierId(), pi.APId(), provider )); //This provider will never be found |
171 |
174 |