# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272378785 -10800 # Node ID c210248fa89dc61a17e6f9d5285c00fe1c10adc4 # Parent 68159986cd410dba5feecbd8522a07e64bf5afcd Revision: 201014 Kit: 201017 diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg Tue Apr 27 17:33:05 2010 +0300 @@ -43,7 +43,7 @@ title LaunchApp_correctUId_synch create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 NULL NULL NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee NULL NULL NULL NULL NULL 0 delete foobar [Endtest] @@ -72,7 +72,7 @@ title LaunchApp_Image_commandline_synch create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 c:\Data\Images\AppTest1.jpg NULL NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee c:\Data\Images\AppTest1.jpg NULL NULL NULL NULL 0 delete foobar [Endtest] @@ -81,7 +81,7 @@ title LaunchApp_Image_Document_synch create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 NULL c:\Data\Images\AppTest2.jpg NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee NULL c:\Data\Images\AppTest2.jpg NULL NULL NULL 0 delete foobar [Endtest] @@ -99,7 +99,7 @@ title LaunchApp_Background_Manual create tappmanagertest foobar //scheme uid commandline doc mode postion callback expectedresult -foobar launchApp s60uid: 0x101f4d90 NULL c:\Data\Images\AppTest4.jpg NULL BackGround NULL 0 +foobar launchApp s60uid: 0x200009ee NULL c:\Data\Images\AppTest4.jpg NULL BackGround NULL 0 delete foobar [Endtest] @@ -178,7 +178,7 @@ title Get_ApplicationList_Postive create tappmanagertest foobar //content Document MimeType ExpectedResult FileName NoOfUids -foobar getlisttest Application NULL NULL 0 Result3 2 0x100059ef 0x10005955 +foobar getlisttest Application NULL NULL 0 Result3 2 0x101f8543 0x10005955 delete foobar [Endtest] diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg Tue Apr 27 17:33:05 2010 +0300 @@ -56,7 +56,7 @@ [Test] title LaunchApp_Image_viewer create tappmgrtest foobar -foobar launchApp s60uid: 0x101f4d90 NULL NULL NULL NULL NULL 0 +foobar launchApp s60uid: 0x200009ee NULL NULL NULL NULL NULL 0 delete foobar [Endtest] @@ -73,7 +73,7 @@ [Test] title LaunchApp_JarFile create tappmgrtest foobar -foobar launchJar s60uid: SpruceTennis NULL NULL NULL NULL NULL 0 +foobar launchJar s60uid: SpruceTennis NULL NULL NULL NULL NULL -2 delete foobar [Endtest] @@ -85,7 +85,7 @@ title LaunchApp_CancellaunchAppL_1 create tappmgrtest foobar // scheme uid commmandline doc mode postion callback expected -foobar CancellaunchAppL s60uid: 0x101f4d90 NULL NULL NULL NULL Callback 0 +foobar CancellaunchAppL s60uid: 0x200009ee NULL NULL NULL NULL Callback 0 delete foobar [Endtest] diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp --- a/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Tue Apr 27 17:33:05 2010 +0300 @@ -406,7 +406,12 @@ //iDburi = HBufC::NewL(VPbkContactStoreUris::DefaultCntDbUri().Length()); //set the DBUri to the default value. //iDburi->Des().Copy(VPbkContactStoreUris::DefaultCntDbUri()); - iDburi = GetDefaultDBUri().AllocLC(); + if(iDburi) + { + delete iDburi; + iDburi=NULL; + } + iDburi = GetDefaultDBUri().AllocL(); //get the number of entries in the map TInt keyCount = aMap->Count(); @@ -1778,7 +1783,7 @@ User::Leave(err); } } - CleanupStack::Pop(); + //CleanupStack::Pop(); CleanupStack::Pop(contact); } //end of if pMap else diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_landmarks/src/landmarkinterface.cpp --- a/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Tue Apr 27 17:33:05 2010 +0300 @@ -946,11 +946,12 @@ landmarkIdArray.AppendL (lmid ); } } - TPtrC dbUri; + TBuf<256> dbUri; + if (ValidateParamL (KExport, KDbUri, exportData, LIW::EVariantTypeDesC, EFalse, variant ) ) { - dbUri.Set (variant.AsDes ( ) ); + dbUri.Append(variant.AsDes ( ) ); } ValidateParamL (KExport, KMimeType, exportData, LIW::EVariantTypeDesC, ETrue, variant ); diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_logging/inc/loggingcallback.h --- a/serviceproviders/sapi_logging/inc/loggingcallback.h Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_logging/inc/loggingcallback.h Tue Apr 27 17:33:05 2010 +0300 @@ -81,9 +81,10 @@ * Implementation of CancelNotifyL method, derived from MLoggingCB * * @param aTransid, Transaction id + * @param aFlag, Flag for notification to LiwBinding */ - void CancelNotifyL( TUint aTransid ); + void CancelNotifyL( TUint aTransid , TBool aFlag ); /** * GetRequestType diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h --- a/serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h Tue Apr 27 17:33:05 2010 +0300 @@ -132,7 +132,14 @@ { iInterval = aInterval ; } - + /** + * Sets the boolean flag iFlagCancel + */ + inline void SetCancelFlag(TBool aValue) + { + iFlagCancel = aValue; + } + /** * Default Desturctor */ @@ -195,6 +202,7 @@ TTimeIntervalMicroSeconds32 iInterval ; CLogViewEvent* iLogViewEvent; CLogFilter* iFilter; + TBool iFlagCancel; }; @@ -230,9 +238,10 @@ * methods * * @param aTransId , Transaction id + * @param aFlag, Flag for notification to LiwBinding */ - virtual void CancelNotifyL(TUint aTransid) = 0 ; + virtual void CancelNotifyL(TUint aTransid ,TBool aFlag) = 0 ; /** * Default Desturctor diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp --- a/serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp Tue Apr 27 17:33:05 2010 +0300 @@ -112,6 +112,7 @@ CLogAsyncService :: CLogAsyncService(): CActive(EPriorityStandard) { iTransId=0; + iFlagCancel=ETrue; } /** @@ -308,7 +309,9 @@ } } - iCallback->CancelNotifyL( iTransId ); + + iCallback->CancelNotifyL( iTransId, iFlagCancel ); + if(iUpdatedEvent) { diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp --- a/serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp Tue Apr 27 17:33:05 2010 +0300 @@ -47,6 +47,7 @@ */ for(TInt iter = 0 ; iter < iRegTable.Count() ; ++iter) { + iRegTable[iter]->GetActiveObj()->SetCancelFlag(EFalse); delete iRegTable[iter] ; } delete iLogService; diff -r 68159986cd41 -r c210248fa89d serviceproviders/sapi_logging/src/loggingcallback.cpp --- a/serviceproviders/sapi_logging/src/loggingcallback.cpp Wed Mar 31 23:02:09 2010 +0300 +++ b/serviceproviders/sapi_logging/src/loggingcallback.cpp Tue Apr 27 17:33:05 2010 +0300 @@ -427,17 +427,20 @@ } - void LoggingInterfaceCB :: CancelNotifyL( TUint aTransid ) + void LoggingInterfaceCB :: CancelNotifyL( TUint aTransid ,TBool aFlag ) { - CleanupStack :: PushL( this ) ; - CLiwGenericParamList *OutParm = CLiwGenericParamList :: NewL() ; - CleanupStack :: PushL( OutParm ) ; - CLiwGenericParamList *InParm = CLiwGenericParamList :: NewL() ; - CleanupStack :: PushL( InParm ) ; - OutParm->AppendL( TLiwGenericParam( KErrCode , TLiwVariant( ( TInt32 )SErrNone ) ) ) ; - iCallBack->HandleNotifyL( aTransid, KLiwEventCanceled, *OutParm, *InParm ) ; - CleanupStack::PopAndDestroy( InParm ); - CleanupStack::PopAndDestroy( OutParm ); - CleanupStack :: Pop( this ) ; + if(aFlag) + { + CleanupStack :: PushL( this ) ; + CLiwGenericParamList *OutParm = CLiwGenericParamList :: NewL() ; + CleanupStack :: PushL( OutParm ) ; + CLiwGenericParamList *InParm = CLiwGenericParamList :: NewL() ; + CleanupStack :: PushL( InParm ) ; + OutParm->AppendL( TLiwGenericParam( KErrCode , TLiwVariant( ( TInt32 )SErrNone ) ) ) ; + iCallBack->HandleNotifyL( aTransid, KLiwEventCanceled, *OutParm, *InParm ) ; + CleanupStack::PopAndDestroy( InParm ); + CleanupStack::PopAndDestroy( OutParm ); + CleanupStack :: Pop( this ) ; + } delete this; }