# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1273846080 -10800 # Node ID effbe8362efc3e32004895d8dd51698d469fba4a # Parent ef634fd8dac3c9da0aef370b9d8be0796f4436df Revision: 201019 Kit: 201019 diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group/envrecall.cmd --- a/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group/envrecall.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group/envrecall.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,21 +19,25 @@ @echo Cleaning stubs... pushd ..\..\stubs\group\ -call bldmake bldfiles -call abld test reallyclean +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN popd @echo Cleaning stubs... Finished @echo build accfwuinotifier... pushd \sf\mw\appsupport\coreapplicationuis\accfwuinotifier\group\ -call bldmake bldfiles -call abld build +REM call bldmake bldfiles +REM call abld build +call sbs popd @echo build accfwuinotifier... Finished @echo build accessoryadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\group\ -call bldmake bldfiles -call abld build accessoryadaptation +REM call bldmake bldfiles +REM call abld build accessoryadaptation +call sbs -p accessoryadaptation popd @echo build accessoryadaptation... Finished \ No newline at end of file diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group/envsetup.cmd --- a/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group/envsetup.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group/envsetup.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,22 +19,30 @@ @echo Cleaning accfwuinotifier... pushd \sf\mw\appsupport\coreapplicationuis\accfwuinotifier\group\ -call bldmake bldfiles -call abld reallyclean +REM call bldmake bldfiles +REM call abld reallyclean +call sbs -c armv5 REALLYCLEAN +call sbs -c winscw REALLYCLEAN popd @echo Cleaning accfwuinotifier... Finished @echo Cleaning accessoryadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\group\ -call bldmake bldfiles -call abld clean armv5 accessoryadaptation +REM call bldmake bldfiles +REM call abld clean armv5 accessoryadaptation +call sbs -p accessoryadaptation -c armv5 CLEAN +call sbs -p accessoryadaptation -c winscw CLEAN popd @echo Cleaning accessoryadaptation... Finished @echo Setting up stubs... pushd ..\..\stubs\group\ -call bldmake bldfiles -call abld test reallyclean -call abld test build +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN +REM call abld test build +call sbs -c armv5.test +call sbs -c winscw.test popd @echo Setting up stubs... Finished diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessorymonitor/tsrc/public/basic/group/envrecall.cmd --- a/accessoryservices/accessorymonitor/tsrc/public/basic/group/envrecall.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessorymonitor/tsrc/public/basic/group/envrecall.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,21 +19,25 @@ @echo Cleaning stubs... pushd ..\stubs\group\ -call bldmake bldfiles -call abld test reallyclean +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN popd @echo Cleaning stubs... Finished @echo build accfwuinotifier... pushd \sf\mw\appsupport\coreapplicationuis\accfwuinotifier\group\ -call bldmake bldfiles -call abld build +REM call bldmake bldfiles +REM call abld build +call sbs popd @echo build accfwuinotifier... Finished @echo build accessoryadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\group\ -call bldmake bldfiles -call abld build accessoryadaptation +REM call bldmake bldfiles +REM call abld build accessoryadaptation +call sbs -p accessoryadaptation popd @echo build accessoryadaptation... Finished \ No newline at end of file diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessorymonitor/tsrc/public/basic/group/envsetup.cmd --- a/accessoryservices/accessorymonitor/tsrc/public/basic/group/envsetup.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessorymonitor/tsrc/public/basic/group/envsetup.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,22 +19,29 @@ @echo Cleaning accfwuinotifier... pushd \sf\mw\appsupport\coreapplicationuis\accfwuinotifier\group\ -call bldmake bldfiles -call abld reallyclean +REM call bldmake bldfiles +REM call abld reallyclean +call sbs -c armv5 REALLYCLEAN +call sbs -c winscw REALLYCLEAN popd @echo Cleaning accfwuinotifier... Finished @echo Cleaning accessoryadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\group\ -call bldmake bldfiles -call abld clean armv5 accessoryadaptation +REM call bldmake bldfiles +REM call abld clean armv5 accessoryadaptation +call sbs -p accessoryadaptation -c armv5 CLEAN popd @echo Cleaning accessoryadaptation... Finished @echo Setting up stubs... pushd ..\stubs\group\ -call bldmake bldfiles -call abld test reallyclean -call abld test build +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN +REM call abld test build +call sbs -c armv5.test +call sbs -c winscw.test popd @echo Setting up stubs... Finished diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envrecall.cmd --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envrecall.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envrecall.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,30 +19,37 @@ @echo Cleaning stubs pushd ..\..\..\stub\group\ -call bldmake bldfiles -call abld test reallyclean +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN popd @echo Cleaning stubs done @echo build remconadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\accessoryadaptation\group\ -call bldmake bldfiles -call abld build remconadaptation +REM call bldmake bldfiles +REM call abld build remconadaptation +call sbs -p remconadaptation popd @echo build remconadaptation... Finished @echo build phoneclient... pushd \sf\mw\phonesrv\phoneclientserver\phoneclient\group -call bldmake bldfiles -call abld build +REM call bldmake bldfiles +REM call abld build +call sbs popd @echo build phoneclient... Finished @echo build phonecmdhandler pushd \sf\mw\phonesrv\phonecmdhandler\group\ -call bldmake bldfiles -call abld makefile -call abld reallyclean -call abld build +REM call bldmake bldfiles +REM call abld makefile +REM call abld reallyclean +call sbs -c armv5 REALLYCLEAN +call sbs -c winscw REALLYCLEAN +REM call abld build +call sbs popd @echo build phonecmdhandler done diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envsetup.cmd --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envsetup.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envsetup.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,17 +19,22 @@ @echo Cleaning remconadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\accessoryadaptation\group\ -call bldmake bldfiles -call abld makefile remconadaptation -call abld reallyclean remconadaptation +REM call bldmake bldfiles +REM call abld makefile remconadaptation +REM call abld reallyclean remconadaptation +call sbs -p remconadaptation -c armv5 REALLYCLEAN +call sbs -p remconadaptation -c winscw REALLYCLEAN popd @echo Cleaning remconadaptation... Finished - @echo build/instr stubs pushd ..\..\..\stub\group\ -call bldmake bldfiles -call abld test reallyclean -call abld test build +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN +REM call abld test build +call sbs -c armv5.test +call sbs -c winscw.test popd @echo build/instr stubs done diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessoryserver/src/Policy/AccPolGenericIDArrayAccessor.cpp --- a/accessoryservices/accessoryserver/src/Policy/AccPolGenericIDArrayAccessor.cpp Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Policy/AccPolGenericIDArrayAccessor.cpp Fri May 14 17:08:00 2010 +0300 @@ -116,13 +116,17 @@ COM_TRACE_( "[AccFW: ACCPOLICY] TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray()" ); TInt iArrayCount( aGenericIDArray.Count() ); - TInt i(aIndex); - for ( ; i < (iArrayCount-1); ++i ) - { - aGenericIDArray.iGenericIDArray[i] = aGenericIDArray.iGenericIDArray[i+1]; - } - TAccPolGenericID emptyID; - aGenericIDArray.iGenericIDArray[i] = emptyID; + TInt i(aIndex); + + if( (iArrayCount > 0) && (i >= 0) ) + { + for ( ; i < (iArrayCount-1); ++i ) + { + aGenericIDArray.iGenericIDArray[i] = aGenericIDArray.iGenericIDArray[i+1]; + } + TAccPolGenericID emptyID; + aGenericIDArray.iGenericIDArray[i] = emptyID; + } COM_TRACE_( "[AccFW: ACCPOLICY] TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray() - return void" ); } diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Fri May 14 17:08:00 2010 +0300 @@ -855,7 +855,10 @@ { TInt index( TAccPolGenericIDArrayAccessor::FindWithUniqueIDL( genericIDArray, aDbId) ); - TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray(genericIDArray, index); + if(KErrNotFound != index) + { + TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray(genericIDArray, index); + } } accMode = iPolicy->ResolveAccessoryModeL( genericIDArray, diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envrecall.cmd --- a/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envrecall.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envrecall.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,41 +19,51 @@ @echo Cleaning stubs... pushd ..\..\..\stubs\group\ -call bldmake bldfiles -call abld test reallyclean +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN popd @echo Cleaning stubs... Finished @echo build BT Audioman Client... pushd \sf\mw\btservices\bluetoothengine\btaudioman\group -call bldmake bldfiles -call abld build +REM call bldmake bldfiles +REM call abld build +call sbs popd @echo build BT Audioman Client... Finished @echo build accfwuinotifier... pushd \sf\mw\appsupport\coreapplicationuis\accfwuinotifier\group -call bldmake bldfiles -call abld build +REM call bldmake bldfiles +REM call abld build +call sbs popd @echo build accfwuinotifier... Finished @echo build accessoryadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\accessoryadaptation\group\ -call bldmake bldfiles -call abld cleanexport -call abld export -call abld build accessoryadaptation +REM call bldmake bldfiles +REM call abld cleanexport +call sbs -c armv5 CLEANEXPORT +call sbs -c winscw CLEANEXPORT +REM call abld export +call sbs -c armv5 EXPORT +call sbs -c winscw EXPORT +REM call abld build accessoryadaptation +call sbs -p accessoryadaptation popd @echo build accessoryadaptation... Finished @echo build Plugged Display ASY... pushd \sf\os\devicesrv\accessoryservices\pluggeddisplay\pluggeddisplayasy\group -call bldmake bldfiles -call abld build +REM call bldmake bldfiles +REM call abld build +call sbs popd @echo build Plugged Display ASY... Finished \ No newline at end of file diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envsetup.cmd --- a/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envsetup.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envsetup.cmd Fri May 14 17:08:00 2010 +0300 @@ -19,43 +19,55 @@ @echo Cleaning BT Audioman Client... pushd \sf\mw\btservices\bluetoothengine\btaudioman\group -call bldmake bldfiles -call abld makefile btaudiomanclient -call abld reallyclean btaudiomanclient +REM call bldmake bldfiles +REM call abld makefile btaudiomanclient +REM call abld reallyclean btaudiomanclient +call sbs -p btaudiomanclient -c armv5 REALLYCLEAN +call sbs -p btaudiomanclient -c winscw REALLYCLEAN popd @echo Cleaning BT Audioman Client... Finished @echo Cleaning accfwuinotifier... pushd \sf\mw\appsupport\coreapplicationuis\accfwuinotifier\group -call bldmake bldfiles -call abld makefile -call abld reallyclean +REM call bldmake bldfiles +REM call abld makefile +REM call abld reallyclean +call sbs -c armv5 REALLYCLEAN +call sbs -c winscw REALLYCLEAN popd @echo Cleaning accfwuinotifier... Finished @echo Cleaning accessoryadaptation... pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\accessoryadaptation\group\ -call bldmake bldfiles -call abld makefile accessoryadaptation -call abld clean accessoryadaptation +REM call bldmake bldfiles +REM call abld makefile accessoryadaptation +REM call abld clean accessoryadaptation +call sbs -p accessoryadaptation -c armv5 CLEAN +call sbs -p accessoryadaptation -c winscw CLEAN popd @echo Cleaning accessoryadaptation... Finished @echo Cleaning Plugged Display ASY... pushd \sf\os\devicesrv\accessoryservices\pluggeddisplay\pluggeddisplayasy\group -call bldmake bldfiles -call abld reallyclean +REM call bldmake bldfiles +REM call abld reallyclean +call sbs -c armv5 REALLYCLEAN +call sbs -c winscw REALLYCLEAN popd @echo Cleaning Plugged Display ASY... Finished @echo Setting up stubs... pushd ..\..\..\stubs\group\ -call bldmake bldfiles -call abld test reallyclean -call abld test build +REM call bldmake bldfiles +REM call abld test reallyclean +call sbs -c armv5.test REALLYCLEAN +call sbs -c winscw.test REALLYCLEAN +REM call abld test build +call sbs -c armv5.test +call sbs -c winscw.test popd @echo Setting up stubs... Finished diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/gid_pc_tool/Data/CMD/CreateDB.cmd --- a/accessoryservices/gid_pc_tool/Data/CMD/CreateDB.cmd Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/gid_pc_tool/Data/CMD/CreateDB.cmd Fri May 14 17:08:00 2010 +0300 @@ -40,8 +40,12 @@ cd%ACCPOL_PATH%\group echo export second xcopy \epoc32\winscw\c\System\Data\DBS_10205030_accpolicydb.db ..\data\ -call abld.bat cleanexport -call abld.bat export +REM call abld.bat cleanexport +call sbs -c armv5 CLEANEXPORT +call sbs -c winscw CLEANEXPORT +REM call abld.bat export +call sbs -c armv5 EXPORT +call sbs -c winscw EXPORT goto end @@ -49,9 +53,13 @@ cd%ACCPOL_PATH%\group echo export first -call bldmake bldfiles -call abld cleanexport -call abld export +REM call bldmake bldfiles +REM call abld cleanexport +call sbs -c armv5 CLEANEXPORT +call sbs -c winscw CLEANEXPORT +REM call abld export +call sbs -c armv5 EXPORT +call sbs -c winscw EXPORT goto importer diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/remotecontrolfw/group/remotecontrol.iby --- a/accessoryservices/remotecontrolfw/group/remotecontrol.iby Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/remotecontrolfw/group/remotecontrol.iby Fri May 14 17:08:00 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -56,7 +56,7 @@ REM *** Now for things which should only be included if the device REM *** supports bluetooth, to save ROM space... -#ifdef SYMBIAN_EXCLUDE_BLUETOOTH +#ifndef __BT REM Feature BLUETOOTH is not in this ROM (remotecontrol.iby) #else // Server @@ -74,6 +74,6 @@ // The concrete Target Selector Plugin. #include -#endif // SYMBIAN_EXCLUDE_BLUETOOTH +#endif // __BT #endif // __REMCON_IBY__ diff -r ef634fd8dac3 -r effbe8362efc accessoryservices/tspclientmapper/src/tspclientmapperimpl.cpp --- a/accessoryservices/tspclientmapper/src/tspclientmapperimpl.cpp Mon May 03 13:42:22 2010 +0300 +++ b/accessoryservices/tspclientmapper/src/tspclientmapperimpl.cpp Fri May 14 17:08:00 2010 +0300 @@ -545,10 +545,14 @@ if ( (TInt)buf().operator[]( i ) != 0 ) // count of registered clients is lost with TFixedArray, so rely on id being different from 0 { COM_TRACE_1( "[TspClientMapperImpl] CTspClientMapperImpl::GetTspTargetClientsL() first client's Pid = %d", (TInt)buf().operator[]( i ) ); - aPidArray.Append( buf().operator[]( i ) ); - } + returnErr = aPidArray.Append( buf().operator[]( i ) ); + if ( returnErr != KErrNone ) + { + break; + } + } } - COM_TRACE_( "[TspClientMapperImpl] CTspClientMapperImpl::GetTspTargetClientsL() - return" ); + COM_TRACE_1 ( "[TspClientMapperImpl] CTspClientMapperImpl::GetTspTargetClientsL() - returnErr: %d", returnErr ); return returnErr; } diff -r ef634fd8dac3 -r effbe8362efc devicesrv_plat/accessory_key_event_handling_api/inc/RemConKeyEventData.h --- a/devicesrv_plat/accessory_key_event_handling_api/inc/RemConKeyEventData.h Mon May 03 13:42:22 2010 +0300 +++ b/devicesrv_plat/accessory_key_event_handling_api/inc/RemConKeyEventData.h Fri May 14 17:08:00 2010 +0300 @@ -22,7 +22,9 @@ #define TREMCONKEYEVENTDATA_H // INCLUDES +#ifndef __KERNEL_MODE__ #include +#endif // CONSTANTS diff -r ef634fd8dac3 -r effbe8362efc hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf --- a/hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf Mon May 03 13:42:22 2010 +0300 +++ b/hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf Fri May 14 17:08:00 2010 +0300 @@ -22,7 +22,6 @@ PRJ_EXPORTS -#include "../plugins/hapticsivtgetterplugin/group/bld.inf" PRJ_MMPFILES hwrmhapticseffectdatagetterfw.mmp diff -r ef634fd8dac3 -r effbe8362efc hwrmhaptics/hapticspacketizer/group/bld.inf --- a/hwrmhaptics/hapticspacketizer/group/bld.inf Mon May 03 13:42:22 2010 +0300 +++ b/hwrmhaptics/hapticspacketizer/group/bld.inf Fri May 14 17:08:00 2010 +0300 @@ -20,7 +20,6 @@ PRJ_EXPORTS -#include "../plugins/hapticsvibepacketizerplugin/group/bld.inf" PRJ_MMPFILES hwrmhapticspacketizer.mmp diff -r ef634fd8dac3 -r effbe8362efc layers.sysdef.xml --- a/layers.sysdef.xml Mon May 03 13:42:22 2010 +0300 +++ b/layers.sysdef.xml Fri May 14 17:08:00 2010 +0300 @@ -14,6 +14,8 @@ + + diff -r ef634fd8dac3 -r effbe8362efc resourceinterfaces/fmtransmittercontrol/group/FmTx_HWRM.iby --- a/resourceinterfaces/fmtransmittercontrol/group/FmTx_HWRM.iby Mon May 03 13:42:22 2010 +0300 +++ b/resourceinterfaces/fmtransmittercontrol/group/FmTx_HWRM.iby Fri May 14 17:08:00 2010 +0300 @@ -21,7 +21,7 @@ #include // Feature Registry (featreg.dll) -#ifndef SYMBIAN_EXCLUDE_FMTX +#ifdef FF_FMTX file=ABI_DIR\DEBUG_DIR\HWRMFmTxClient.dll SYSTEM_BINDIR\HWRMFmTxClient.dll #endif diff -r ef634fd8dac3 -r effbe8362efc resourcemgmt/hwresourcesmgr/test/data/featreg/RemovableFeatures.iby --- a/resourcemgmt/hwresourcesmgr/test/data/featreg/RemovableFeatures.iby Mon May 03 13:42:22 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/data/featreg/RemovableFeatures.iby Fri May 14 17:08:00 2010 +0300 @@ -17,18 +17,18 @@ #define __REMOVABLEFEATURES_IBY__ #define SYMBIAN_EXCLUDE_FAX -#define SYMBIAN_EXCLUDE_PRINT -#define SYMBIAN_EXCLUDE_MMC +#undef __UPNP_PRINT_FRAMEWORK +#undef __MMC #define SYMBIAN_EXCLUDE_RTP_RTCP #define SYMBIAN_EXCLUDE_PC_CONNECTIVITY_EXCEPT_SECURE_BACKUP -#define SYMBIAN_EXCLUDE_INFRARED -#define SYMBIAN_EXCLUDE_BLUETOOTH +#undef __IRDA +#undef __BT #define SYMBIAN_EXCLUDE_OBEX -#define SYMBIAN_EXCLUDE_USB +#undef __USB #define SYMBIAN_EXCLUDE_DRM_AGENT_PLUGINS -#define SYMBIAN_EXCLUDE_IPSEC +#undef __IPSEC #define SYMBIAN_EXCLUDE_QOS_PROTPLUGINS -#define SYMBIAN_EXCLUDE_DHCP +#undef __DHCP #define SYMBIAN_EXCLUDE_MOBILEIP #define SYMBIAN_EXCLUDE_LOCATION #define SYMBIAN_EXCLUDE_SIP @@ -36,13 +36,13 @@ #define SYMBIAN_EXCLUDE_OMA_DATASYNC #define SYMBIAN_EXCLUDE_OMA_DEVMAN #define SYMBIAN_EXCLUDE_OMA_DS_HOSTSERVERS -#define SYMBIAN_EXCLUDE_MTP +#undef __MTP_PROTOCOL_SUPPORT // Include HWRM features by uncommenting their exclusion macros -//#define SYMBIAN_EXCLUDE_FMTX -//#define SYMBIAN_EXCLUDE_VIBRA -//#define SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR -//#define SYMBIAN_EXCLUDE_COVER_DISPLAY -//#define SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER +//#undef FF_FMTX +//#undef __VIBRA +//#undef __SERIES60_AMBIENT_LIGHT_SENSOR +//#undef __COVER_DISPLAY +//#undef __SERIES60_KEYPAD_NO_SLIDER #endif diff -r ef634fd8dac3 -r effbe8362efc sensorservices/sensorserver/src/server/sensrvpluginproxy.cpp --- a/sensorservices/sensorserver/src/server/sensrvpluginproxy.cpp Mon May 03 13:42:22 2010 +0300 +++ b/sensorservices/sensorserver/src/server/sensrvpluginproxy.cpp Fri May 14 17:08:00 2010 +0300 @@ -1342,7 +1342,7 @@ return KErrBadHandle; } - __UHEAP_MARK; + // __UHEAP_MARK; #ifdef MEMORY_TRACE_DEBUG // TRACE heap usage @@ -1428,7 +1428,7 @@ MEMORY_TRACE( ( _L( "#### Sensor Server, SSY exit - HEAP: Size: %d, Available: %d, Used: %d, Change in used: %d" ), heapSize, heapAvail, newUsed, newUsed - used ) ); #endif - __UHEAP_MARKEND; + // __UHEAP_MARKEND; return err; } diff -r ef634fd8dac3 -r effbe8362efc sysstatemgmt/ssmpolicyplugins/ssmswppolicybase/src/ssmswppolicybase.cpp --- a/sysstatemgmt/ssmpolicyplugins/ssmswppolicybase/src/ssmswppolicybase.cpp Mon May 03 13:42:22 2010 +0300 +++ b/sysstatemgmt/ssmpolicyplugins/ssmswppolicybase/src/ssmswppolicybase.cpp Fri May 14 17:08:00 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -22,6 +22,7 @@ #include #include #include +#include #include "ssmswppolicybase.h" #include "trace.h" @@ -135,27 +136,30 @@ } else { - RSsmStateManager session; - TInt errorCode = session.Connect(); - ERROR( errorCode, "Failed to connect to RSsmStateManager" ); - if ( errorCode == KErrNone ) - { - if ( ResetLimitReached() ) // Updates the reset count - { - INFO( "SWP transition failed -> Fail" ); - errorCode = session.RequestStateTransition( - TSsmStateTransition( ESsmFail, KSsmAnySubState, 0 ) ); - } - else - { - INFO( "SWP transition failed -> Reset" ); - errorCode = session.RequestStateTransition( - TSsmStateTransition( ESsmShutdown, KSsmAnySubState, - RStarterSession::EUnknownReset ) ); - } + TSsmState currentState; + TInt errorCode = GetCurrentState(currentState); - session.Close(); - } + if ( ((currentState.MainState() != ESsmShutdown) && (currentState.MainState() != ESsmFail)) || KErrNone != errorCode) + { + RSsmStateManager session; + errorCode = session.Connect(); + ERROR( errorCode, "Failed to connect to RSsmStateManager" ); + if ( KErrNone == errorCode ) + { + if ( ResetLimitReached() ) // Updates the reset count + { + INFO_1( "SWP 0x%08x transition failed -> Fail", aSwp.Key() ); + errorCode = session.RequestStateTransition( TSsmStateTransition( ESsmFail, KSsmAnySubState, 0 ) ); + } + else + { + INFO_1( "SWP 0x%08x transition failed -> Reset", aSwp.Key() ); + errorCode = session.RequestStateTransition( + TSsmStateTransition( ESsmShutdown, KSsmAnySubState, RStarterSession::EUnknownReset ) ); + } + session.Close(); + } + } TRequestStatus* status = &aStatus; User::RequestComplete( status, errorCode );