--- a/omaprovisioning/provisioning/ProvisioningEngine/Src/WPAdapterUtil.cpp Thu May 27 13:43:36 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Src/WPAdapterUtil.cpp Fri Jun 11 14:27:59 2010 +0300
@@ -29,7 +29,6 @@
#include <data_caging_path_literals.hrh>
#include "CWPInternetAPDB.h"
-#include <ApUtils.h>
#include "ProvisioningDebug.h"
#include <cmmanager.h>
#include <cmmanagerext.h>
@@ -389,20 +388,21 @@
TBuf<KOriginatorMaxLength> Orig1;
Orig1.Copy(Orig);
- CCommsDatabase* commDb = CCommsDatabase::NewL();
- CleanupStack::PushL( commDb );
- CApUtils* aputils = CApUtils::NewLC( *commDb );
-
- TUint32 apid = 0;
- //Get IAP ID from WAPID
- TRAPD( ERROR, apid = aputils->IapIdFromWapIdL( aAPId ) );
+ RCmManagerExt cmmanagerExt;
+ cmmanagerExt.OpenL();
+ CleanupClosePushL(cmmanagerExt);
+ RCmConnectionMethodExt cm;
+ cm = cmmanagerExt.ConnectionMethodL( aAPId );
+ CleanupClosePushL( cm );
+ TUint apId = 0;
+ TRAPD( ERROR, apId = cm.GetIntAttributeL(CMManager::ECmIapId) );
User::LeaveIfError(ERROR);
//Set AP to SNAP and DB
- TRAPD(err,SetAPtoDBandSNAPL(apid, Orig1));
+ TRAPD(err,SetAPtoDBandSNAPL(apId, Orig1));
User::LeaveIfError(err);
- CleanupStack::PopAndDestroy(2); //aputils, commDb
+ CleanupStack::PopAndDestroy(2); //cm, cmmanagerExt
FLOG( _L( "[Provisioning] WPAdapterUtil::SetAPDetailsL: done" ) );