# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701802 -10800 # Node ID dc67b94625c5bc2d5c1b6b8a486f841192cbc9ed # Parent 09d657f1ee00226c8e9697954e99e77c0371b864 Revision: 201037 Kit: 201037 diff -r 09d657f1ee00 -r dc67b94625c5 accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp --- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp Thu Sep 02 21:48:26 2010 +0300 +++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp Fri Sep 17 08:36:42 2010 +0300 @@ -152,8 +152,12 @@ { delete iZeroObserver; } + + iAsyComms.CloseSubSession(); + iServer.Disconnect(); + iServer.Close(); - COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommsService::~CASYProxyCommsService" ); + COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommsService::~CASYProxyCommsService" ); } // ----------------------------------------------------------------------------- diff -r 09d657f1ee00 -r dc67b94625c5 devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericid.h --- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericid.h Thu Sep 02 21:48:26 2010 +0300 +++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericid.h Fri Sep 17 08:36:42 2010 +0300 @@ -25,8 +25,8 @@ // INCLUDES #include #include -#include -#include +#include +#include // CONSTANTS diff -r 09d657f1ee00 -r dc67b94625c5 devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericidArray.h --- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericidArray.h Thu Sep 02 21:48:26 2010 +0300 +++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericidArray.h Fri Sep 17 08:36:42 2010 +0300 @@ -23,7 +23,7 @@ #define ACCPOLGENERICIDARRAY_H // INCLUDES -#include +#include // CONSTANTS // Maximum amount of Generic ID -instances that an array can contain. diff -r 09d657f1ee00 -r dc67b94625c5 resourcemgmt/hwresourcesmgr/server/src/HWRMFmTxRdsTextConverter.cpp --- a/resourcemgmt/hwresourcesmgr/server/src/HWRMFmTxRdsTextConverter.cpp Thu Sep 02 21:48:26 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMFmTxRdsTextConverter.cpp Fri Sep 17 08:36:42 2010 +0300 @@ -101,6 +101,7 @@ { COMPONENT_TRACE1( _L( "HWRM Server - CHWRMFmTxRdsTextConverter::~CHWRMFmTxRdsTextConverter()" ) ); + iConvertFromUnicodeFile.Close(); iFileServer.Close(); COMPONENT_TRACE1( _L( "HWRM Server - CHWRMFmTxRdsTextConverter::~CHWRMFmTxRdsTextConverter - return" ) ); diff -r 09d657f1ee00 -r dc67b94625c5 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmlocaleobserversup.cpp --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmlocaleobserversup.cpp Thu Sep 02 21:48:26 2010 +0300 +++ b/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmlocaleobserversup.cpp Fri Sep 17 08:36:42 2010 +0300 @@ -517,6 +517,7 @@ iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHebrew, ERegISR ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHindi, ERegIND ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangIndonesian, ERegIDN ) ); + iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangKorean, ERegKOR ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLatvian, ERegLVA ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLithuanian, ERegLTU ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangMalay, ERegMYS ) ); diff -r 09d657f1ee00 -r dc67b94625c5 sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp --- a/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp Thu Sep 02 21:48:26 2010 +0300 +++ b/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp Fri Sep 17 08:36:42 2010 +0300 @@ -235,6 +235,7 @@ iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHebrew, ERegISR ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHindi, ERegIND ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangIndonesian, ERegIDN ) ); + iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangKorean, ERegKOR ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLatvian, ERegLVA ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLithuanian, ERegLTU ) ); iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangMalay, ERegMYS ) ); diff -r 09d657f1ee00 -r dc67b94625c5 sysstatemgmt/systemstatemgr/cle/src/clecli.cpp --- a/sysstatemgmt/systemstatemgr/cle/src/clecli.cpp Thu Sep 02 21:48:26 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/cle/src/clecli.cpp Fri Sep 17 08:36:42 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -42,10 +42,16 @@ User::Leave( KErrAlreadyExists ); } - const TInt err = CreateSession(KCleSrvName, iVersion, KCleSrvMsgSlots); + TInt err = CreateSession(KCleSrvName, iVersion, KCleSrvMsgSlots); if( (KErrNotFound == err) || (KErrServerTerminated == err) ) { - User::LeaveIfError( CCleServer::StartCleSrv(KCleSrvName) ); + err = CCleServer::StartCleSrv(KCleSrvName); + DEBUGPRINT2(_L("Starting CleSrv completed with %d"),err); + if (KErrNone != err && KErrAlreadyExists != err) + { + User::Leave(err); + } + User::LeaveIfError( CreateSession(KCleSrvName, iVersion, KCleSrvMsgSlots) ); } else @@ -70,10 +76,17 @@ User::Leave( KErrAlreadyExists ); } - const TInt err = CreateSession(aServerName, iVersion, KCleSrvMsgSlots); + TInt err = CreateSession(aServerName, iVersion, KCleSrvMsgSlots); if( (KErrNotFound == err) || (KErrServerTerminated == err) ) { - User::LeaveIfError( CCleServer::StartCleSrv(aServerName) ); + err = CCleServer::StartCleSrv(aServerName); + + DEBUGPRINT2(_L("Starting CleSrv completed with %d"),err); + if (KErrNone != err && KErrAlreadyExists != err) + { + User::Leave(err); + } + User::LeaveIfError( CreateSession(aServerName, iVersion, KCleSrvMsgSlots) ); } else diff -r 09d657f1ee00 -r dc67b94625c5 sysstatemgmt/systemstatemgr/ssm/src/ssmswppolicycli.cpp --- a/sysstatemgmt/systemstatemgr/ssm/src/ssmswppolicycli.cpp Thu Sep 02 21:48:26 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/ssm/src/ssmswppolicycli.cpp Fri Sep 17 08:36:42 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -41,10 +41,17 @@ User::Leave(KErrAlreadyExists); } - const TInt err = CreateSession(KSsmSwpPolicySrvName, iVersion, KSsmSwpPolicySrvMsgSlots); + TInt err = CreateSession(KSsmSwpPolicySrvName, iVersion, KSsmSwpPolicySrvMsgSlots); if((KErrNotFound == err) || (KErrServerTerminated == err)) { - User::LeaveIfError(CSsmSwpPolicyServer::StartSsmSwpPolicySrv(KSsmSwpPolicySrvName)); + err = CSsmSwpPolicyServer::StartSsmSwpPolicySrv(KSsmSwpPolicySrvName); + + DEBUGPRINT2(_L("Starting SsmSwpPolicySrv completed with %d"),err); + if (KErrNone != err && KErrAlreadyExists != err) + { + User::Leave(err); + } + User::LeaveIfError(CreateSession(KSsmSwpPolicySrvName, iVersion, KSsmSwpPolicySrvMsgSlots)); DEBUGPRINT1(_L("RSsmSwpPolicySession Connect Completed with KErrNone")); } @@ -72,10 +79,17 @@ User::Leave(KErrAlreadyExists); } - const TInt err = CreateSession(aServerName, iVersion, KSsmSwpPolicySrvMsgSlots); + TInt err = CreateSession(aServerName, iVersion, KSsmSwpPolicySrvMsgSlots); if((KErrNotFound == err) || (KErrServerTerminated == err)) { - User::LeaveIfError(CSsmSwpPolicyServer::StartSsmSwpPolicySrv(aServerName)); + err = CSsmSwpPolicyServer::StartSsmSwpPolicySrv(aServerName); + + DEBUGPRINT2(_L("Starting SsmSwpPolicySrv completed with %d"),err); + if (KErrNone != err && KErrAlreadyExists != err) + { + User::Leave(err); + } + User::LeaveIfError(CreateSession(aServerName, iVersion, KSsmSwpPolicySrvMsgSlots)); DEBUGPRINT1(_L("RSsmSwpPolicySession Connect Completed with KErrNone")); }