equal
deleted
inserted
replaced
68 |
68 |
69 delete iTrans; |
69 delete iTrans; |
70 |
70 |
71 if ( iIsFeatureManagerInitialised ) |
71 if ( iIsFeatureManagerInitialised ) |
72 { |
72 { |
|
73 // Feature manager must not be uninitialized earlier. Plugins must be |
|
74 // able to use it. |
73 FeatureManager::UnInitializeLib(); |
75 FeatureManager::UnInitializeLib(); |
74 } |
76 } |
75 |
77 |
76 REComSession::FinalClose(); |
78 REComSession::FinalClose(); |
77 |
79 |
105 // |
107 // |
106 void CCmManagerImpl::ConstructL() |
108 void CCmManagerImpl::ConstructL() |
107 { |
109 { |
108 OstTraceFunctionEntry0( CCMMANAGERIMPL_CONSTRUCTL_ENTRY ); |
110 OstTraceFunctionEntry0( CCMMANAGERIMPL_CONSTRUCTL_ENTRY ); |
109 |
111 |
|
112 // Feature Manager is initialized here, and it can be used by plugins also. |
|
113 // It is uninitialized in destructor. |
110 FeatureManager::InitializeLibL(); |
114 FeatureManager::InitializeLibL(); |
111 iIsFeatureManagerInitialised = ETrue; |
115 iIsFeatureManagerInitialised = ETrue; |
112 iWLanSupport = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan ); |
116 iWLanSupport = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan ); |
113 |
117 |
114 CommsDat::CMDBSession* db = CommsDat::CMDBSession::NewLC( KCDVersion1_2 ); |
118 CommsDat::CMDBSession* db = CommsDat::CMDBSession::NewLC( KCDVersion1_2 ); |
131 { |
135 { |
132 OstTraceFunctionEntry0( CCMMANAGERIMPL_CHECKTABLESL_ENTRY ); |
136 OstTraceFunctionEntry0( CCMMANAGERIMPL_CHECKTABLESL_ENTRY ); |
133 |
137 |
134 TInt err( 0 ); |
138 TInt err( 0 ); |
135 |
139 |
136 TRAP( err, iSnapTableId = CCDDataMobilitySelectionPolicyRecord::TableIdL( iTrans->Session() )); |
|
137 if ( err == KErrNotFound ) |
|
138 { |
|
139 iSnapTableId = CCDDataMobilitySelectionPolicyRecord::CreateTableL( iTrans->Session() ); |
|
140 } |
|
141 else |
|
142 { |
|
143 User::LeaveIfError( err ); |
|
144 } |
|
145 |
|
146 TRAP( err, iBearerPriorityTableId = |
140 TRAP( err, iBearerPriorityTableId = |
147 CCDGlobalBearerTypePriorizationRecord::TableIdL( iTrans->Session() ) ); |
141 CCDGlobalBearerTypePriorizationRecord::TableIdL( iTrans->Session() ) ); |
148 if ( err == KErrNotFound ) |
142 if ( err == KErrNotFound ) |
149 { |
143 { |
150 iBearerPriorityTableId = |
144 iBearerPriorityTableId = |
151 CCDGlobalBearerTypePriorizationRecord::CreateTableL( iTrans->Session() ); |
145 CCDGlobalBearerTypePriorizationRecord::CreateTableL( iTrans->Session() ); |
|
146 } |
|
147 else |
|
148 { |
|
149 User::LeaveIfError( err ); |
|
150 } |
|
151 |
|
152 TRAP( err, iSnapTableId = CCDDataMobilitySelectionPolicyRecord::TableIdL( iTrans->Session() )); |
|
153 if ( err == KErrNotFound ) |
|
154 { |
|
155 iSnapTableId = CCDDataMobilitySelectionPolicyRecord::CreateTableL( iTrans->Session() ); |
152 } |
156 } |
153 else |
157 else |
154 { |
158 { |
155 User::LeaveIfError( err ); |
159 User::LeaveIfError( err ); |
156 } |
160 } |