# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271251944 -10800 # Node ID ba42c4bd84dd2ff8a1a18534b6697c689e122409 # Parent a19c8664496d9debb51fb1ec1280d24fc99cdc9a Revision: 201013 Kit: 201015 diff -r a19c8664496d -r ba42c4bd84dd cbs/CbsServer/ServerSrc/CCbsSatRefresh.cpp --- a/cbs/CbsServer/ServerSrc/CCbsSatRefresh.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/cbs/CbsServer/ServerSrc/CCbsSatRefresh.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -21,8 +21,8 @@ // INCLUDE FILES #include "CCbsSatRefresh.h" #include "CCbsServer.h" -#include -#include +#include +#include #include "CbsLogger.h" diff -r a19c8664496d -r ba42c4bd84dd cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp --- a/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -231,6 +231,17 @@ iRSSSettings.HandleRefresh(); } + TBool cspEfFound = + aFiles.Locate( KCsp1Ef ) != KErrNotFound || + aFiles.Locate( KCsp2Ef ) != KErrNotFound; + + // KCspEf is no longer provided by SAT but GS and PS seem to depend on it, + // handled here for now. + TBool fileFound = + aFiles.Locate( iNotifyInfo->iObservedFile ) != KErrNotFound || + cspEfFound && iNotifyInfo->iObservedFile == KCspEf; + + // By default refresh is allowed. TBool allow(ETrue); @@ -240,96 +251,46 @@ // Handle only if observer wants to listen this event. if ( iNotifyInfo->iObservedRefreshType & aType ) { - TInt changedFiles(0); - // Only change notification will contain file list. - if ( aType == EFileChangeNotification ) - { - if ( aFiles.Locate( KCspEf ) != KErrNotFound ) - { - changedFiles += KCspEf; - } - // Check if the changed files is what is wanted to be listened. - changedFiles = changedFiles & iNotifyInfo->iObservedFile; - } - - // For change notification the filelist must contain files, for - // other refresh types it is empty. - if ( ( aType != EFileChangeNotification ) || - ( ( aType == EFileChangeNotification ) && - changedFiles ) ) + if ( aType != EFileChangeNotification || fileFound ) { if ( aFunctionality == ESSSettingsRefresh ) { // Inform the observer about the refresh event. iNotifyInfo->iObserver->Refresh( - aType, - ( TSatElementaryFiles ) changedFiles ); - - if ( aFiles.Locate( KCsp1Ef ) != KErrNotFound ) - { - iRSatRefresh->RefreshEFRead( ETrue ); - } - else if( aFiles.Locate( KCsp2Ef ) != KErrNotFound ) - { - iRSatRefresh->RefreshEFRead( ETrue ); - } - else - { - iRSatRefresh->RefreshEFRead( EFalse ); - } + aType, iNotifyInfo->iObservedFile ); + iRSatRefresh->RefreshEFRead( cspEfFound ); } else // ESSSettingsAllowRefresh { // Inform the observer about the coming refresh event. allow = iNotifyInfo->iObserver->AllowRefresh( - aType, - ( TSatElementaryFiles ) changedFiles ); + aType, iNotifyInfo->iObservedFile ); } } // If there is no client listening changed files SSSettings has to // check if some CSP file is into the list and send right response // since itself reads CSP files. - if ( !changedFiles ) + if ( !fileFound ) { - if ( aFiles.Locate( KCsp1Ef ) != KErrNotFound ) - { - iRSatRefresh->RefreshEFRead( EFalse ); - } - else if( aFiles.Locate( KCsp2Ef ) != KErrNotFound ) - { - iRSatRefresh->RefreshEFRead( EFalse ); - } - else - { - iRSatRefresh->RefreshEFRead( ETrue ); - } - } - __SSSLOGSTRING1("[SSS] DoHandleRefresh: changedFiles: %d", changedFiles); + iRSatRefresh->RefreshEFRead( !cspEfFound ); + } } else { - iRSatRefresh->RefreshEFRead( EFalse ); + iRSatRefresh->RefreshEFRead( EFalse ); } } - - if ( !iNotifyInfo->iObserver && ( aType == EFileChangeNotification - || aType == ESimInitFileChangeNotification - || aType == ESimInit ) ) - { - if ( aFiles.Locate( KCsp1Ef ) != KErrNotFound ) - { - iRSatRefresh->RefreshEFRead( EFalse ); - } - else if( aFiles.Locate( KCsp2Ef ) != KErrNotFound ) - { - iRSatRefresh->RefreshEFRead( EFalse ); - } - else - { - iRSatRefresh->RefreshEFRead( ETrue ); - } - } + else if ( aType == EFileChangeNotification + || aType == ESimInitFileChangeNotification + || aType == ESimInit ) + { + iRSatRefresh->RefreshEFRead( !cspEfFound ); + } + else + { + // Do nothing + } __SSSLOGSTRING("[SSS] <--CSSSettingsRefreshHandler::DoHandleRefresh"); return allow; diff -r a19c8664496d -r ba42c4bd84dd networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWNetworkViagRefresh.cpp --- a/networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWNetworkViagRefresh.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWNetworkViagRefresh.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -22,8 +22,8 @@ #include "CNWNetworkViagRefresh.h" #include "CNWNetworkViagBaseEngine.h" #include "NWLogger.h" -#include -#include +#include +#include #include "CNWNetworkViagSimReader.h" diff -r a19c8664496d -r ba42c4bd84dd phoneclientserver/phoneclient/Inc/SharedClientServer/PhCltClientServer.h --- a/phoneclientserver/phoneclient/Inc/SharedClientServer/PhCltClientServer.h Wed Mar 31 22:34:38 2010 +0300 +++ b/phoneclientserver/phoneclient/Inc/SharedClientServer/PhCltClientServer.h Wed Apr 14 16:32:24 2010 +0300 @@ -58,7 +58,7 @@ _LIT( KPhClientAndServerResourceFileName, "PhoneServer" ); _LIT( KPhCltServerZDrive, "z:" ); -_LIT( KPhClientAndServerResourceFileExtensionWild, ".R??" ); +_LIT( KPhClientAndServerResourceFileExtensionWild, ".R*" ); _LIT( KPhClientAndServerResourceFileExtensionNoWild, ".RSC" ); const TInt KPhSrvMagicResourceFileSignature = 0; diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat --- a/phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat Wed Apr 14 16:32:24 2010 +0300 @@ -54,7 +54,7 @@ set INSTRUMENT=TRUE set REMOVEINSTRUMENT=TRUE set DOMODULESTESTS=TRUE -set ABLD_CALL=abld test build winscw udeb -keepgoing +set SBS_CALL=sbs --config winscw_udeb.test --keepgoing build set PATH_TO_DLL=\epoc32\release\winscw\udeb set PATH_TO_MOVE_DLL=\epoc32\release\winscw\udeb\z\sys\bin set PATH_TO_COVERAGE_DATA=\coverage_data @@ -145,13 +145,12 @@ pushd . call cd %1\group -call bldmake bldfiles -call abld -k test clean winscw udeb -call abld -k test reallyclean winscw udeb +call sbs --config winscw_udeb.test --keepgoing clean +call sbs --config winscw_udeb.test --keepgoing reallyclean if [%INSTRUMENT%] EQU [TRUE] ( -call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL% +call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%" ) else ( -call %ABLD_CALL% +call %SBS_CALL% ) popd diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_client_api/group/bld.inf --- a/phonesrv_plat/sat_client_api/group/bld.inf Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_client_api/group/bld.inf Wed Apr 14 16:32:24 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: File that exports the files belonging to -: SAT Client API +* SAT Client API * */ @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/RSatSession.h MW_LAYER_PLATFORM_EXPORT_PATH( RSatSession.h ) +../inc/RSatSession.h MW_LAYER_PLATFORM_EXPORT_PATH( rsatsession.h ) diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_client_api/tsrc/group/satclientapitest.mmp --- a/phonesrv_plat/sat_client_api/tsrc/group/satclientapitest.mmp Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_client_api/tsrc/group/satclientapitest.mmp Wed Apr 14 16:32:24 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Test class for SAT Client API / RSatSession.h +* Description: Test class for SAT Client API / rsatsession.h * */ diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_client_api/tsrc/inc/satclientapitest.h --- a/phonesrv_plat/sat_client_api/tsrc/inc/satclientapitest.h Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_client_api/tsrc/inc/satclientapitest.h Wed Apr 14 16:32:24 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Test class for SAT Client API / RSatSession.h +* Description: Test class for SAT Client API / rsatsession.h * */ @@ -22,7 +22,7 @@ #include #include // API under testing: -#include +#include // Logging path _LIT( KSatClientAPILogPath, "\\logs\\testframework\\SATClientAPITest\\" ); @@ -31,7 +31,7 @@ /** -* Test class for SAT Client API / RSatSession.h +* Test class for SAT Client API / rsatsession.h * * @lib satclientapitest.dll * @since S60 5.0 diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_client_api/tsrc/src/satclientapitest.cpp --- a/phonesrv_plat/sat_client_api/tsrc/src/satclientapitest.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_client_api/tsrc/src/satclientapitest.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Test class for SAT Client API / RSatSession.h +* Description: Test class for SAT Client API / rsatsession.h * */ diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_configuration_api/group/bld.inf --- a/phonesrv_plat/sat_configuration_api/group/bld.inf Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_configuration_api/group/bld.inf Wed Apr 14 16:32:24 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: File that exports the files belonging to -: SAT Configuration API +* SAT Configuration API * */ @@ -24,4 +24,4 @@ PRJ_EXPORTS -../inc/SATDomainPSKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(SATDomainPSKeys.h) +../inc/SATDomainPSKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(satdomainpskeys.h) diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_refresh_api/group/bld.inf --- a/phonesrv_plat/sat_refresh_api/group/bld.inf Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_refresh_api/group/bld.inf Wed Apr 14 16:32:24 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: File that exports the files belonging to -: SAT Refresh API +* SAT Refresh API * */ @@ -24,5 +24,5 @@ PRJ_EXPORTS -../inc/RSatRefresh.h MW_LAYER_PLATFORM_EXPORT_PATH(RSatRefresh.h) +../inc/RSatRefresh.h MW_LAYER_PLATFORM_EXPORT_PATH(rsatrefresh.h) ../inc/MSatRefreshObserver.h MW_LAYER_PLATFORM_EXPORT_PATH(msatrefreshobserver.h) diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_refresh_api/inc/RSatRefresh.h --- a/phonesrv_plat/sat_refresh_api/inc/RSatRefresh.h Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_refresh_api/inc/RSatRefresh.h Wed Apr 14 16:32:24 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include // FORWARD DECLARATIONS class RSatSession; diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_refresh_api/tsrc/group/satrefreshapitest.mmp --- a/phonesrv_plat/sat_refresh_api/tsrc/group/satrefreshapitest.mmp Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_refresh_api/tsrc/group/satrefreshapitest.mmp Wed Apr 14 16:32:24 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: Test class for SAT Refresh API / -* RSatRefresh.h, MSatRefreshObserver.h +* rsatrefresh.h, msatrefreshobserver.h * */ diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_refresh_api/tsrc/inc/satrefreshapitest.h --- a/phonesrv_plat/sat_refresh_api/tsrc/inc/satrefreshapitest.h Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_refresh_api/tsrc/inc/satrefreshapitest.h Wed Apr 14 16:32:24 2010 +0300 @@ -24,10 +24,10 @@ #include #include "satrefreshobserver.h" // API under testing: -#include -#include +#include +#include // This is needed for Refresh API -#include +#include // Logging path _LIT( KSatRefreshAPILogPath, "\\logs\\testframework\\SATRefreshAPITest\\" ); diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/sat_refresh_api/tsrc/inc/satrefreshobserver.h --- a/phonesrv_plat/sat_refresh_api/tsrc/inc/satrefreshobserver.h Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/sat_refresh_api/tsrc/inc/satrefreshobserver.h Wed Apr 14 16:32:24 2010 +0300 @@ -23,10 +23,10 @@ #include #include // API under testing: -#include -#include +#include +#include // This is needed for Refresh API -#include +#include /** * Refresh event observer diff -r a19c8664496d -r ba42c4bd84dd phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h --- a/phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h Wed Mar 31 22:34:38 2010 +0300 +++ b/phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h Wed Apr 14 16:32:24 2010 +0300 @@ -33,9 +33,9 @@ #include // from PhoneClient #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/Commands/OpenChannelCmd/src/COpenChannelHandler.cpp --- a/satengine/SatServer/Commands/OpenChannelCmd/src/COpenChannelHandler.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/Commands/OpenChannelCmd/src/COpenChannelHandler.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -633,6 +633,8 @@ "OPENCHANNEL: COpenChannelHandler::SetConnectionSettingsL calling,\ aBearerType: %d", aBearerType ) + RPacketContext::TProtocolType pdpType = RPacketContext::EPdpTypeIPv4; + TUint32 defaultId( 0 ); switch ( aBearerType ) { case MSatBIPUtils::ESatGPRS: @@ -648,9 +650,8 @@ TUint32 nwId( 0 ); TBool apnCreated( EFalse ); - RPacketContext::TProtocolType pdpType = - RPacketContext::EPdpTypeIPv6; - + pdpType = RPacketContext::EPdpTypeIPv6; + if ( RSat::EIPv4Address == iOpenChannelData.iDestinationAddress.iType ) { @@ -684,10 +685,14 @@ } else { - LOG( NORMAL, "OPENCHANNEL: COpenChannelHandler::SetConnectionSettingsL \ + LOG( NORMAL, "OPENCHANNEL: SetConnectionSettingsL \ No APN, using defaults" ) // No APN, use default settings - SetOverrideSettingsL( 0 ); + TRAPD( err, defaultId = + iUtils->BipUtils().ApnHandler().FindDefaultApL( pdpType ) ); + LOG2( NORMAL, "OPENCHANNEL: SetConnectionSettingsL \ + No APN, using defaults err = %i", err ) + SetOverrideSettingsL( defaultId ); } break; } @@ -703,7 +708,11 @@ #ifdef SAT_USE_DUMMY_TSY // No APN, use default settings - SetOverrideSettingsL( 0 ); + TRAPD( err, + defaultId = iUtils->BipUtils().ApnHandler().FindDefaultApL( pdpType ) ); + LOG2( NORMAL, "OPENCHANNEL: COpenChannelHandler::SetConnectionSettingsL \ + No APN, using defaults err = %i", err ) + SetOverrideSettingsL( defaultId ); #endif // SAT_USE_DUMMY_TSY LOG( SIMPLE, diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/Engine/inc/CSatApnHandler.h --- a/satengine/SatServer/Engine/inc/CSatApnHandler.h Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/Engine/inc/CSatApnHandler.h Wed Apr 14 16:32:24 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -80,6 +80,13 @@ */ void DeleteApnL( TUint32 aApnId ); + /** + * Find the default APN Id + * @param aPdpType, indicates the address type is IPv4 or IPv6 + * @return a default iap id + */ + TUint32 FindDefaultApL( + const RPacketContext::TProtocolType& aPdpType ); private: /** diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/Engine/src/CSatApnHandler.cpp --- a/satengine/SatServer/Engine/src/CSatApnHandler.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/Engine/src/CSatApnHandler.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include "MSatUtils.h" #include "CSatApnHandler.h" @@ -386,4 +388,74 @@ return formatApnName; } +// ----------------------------------------------------------------------------- +// CSatApnHandler::FindDefaultApL +// ----------------------------------------------------------------------------- +// +TUint32 CSatApnHandler::FindDefaultApL( + const RPacketContext::TProtocolType& aPdpType ) + { + LOG( SIMPLE, "SATENGINE: CSatApnHandler::FindDefaultApL calling" ); + TUint32 defaultIap( 0 ); + TInt pdpType; + TBool isFound( EFalse ); + + // create a network destination + RCmDestination des; + RCmConnectionMethod cm; + + // Create CMManager Session + RCmManager cmManager; + cmManager.OpenL(); + CleanupClosePushL( cmManager ); + + // Get the Connection Method list from the open CMManager session + RArray array = RArray( KSatCMGranularity ); + CleanupClosePushL( array ); + + // list all available destinations' id + cmManager.AllDestinationsL( array ); + for( TInt i = 0; ( i < array.Count() ) && !isFound; ++i ) + { + des = cmManager.DestinationL( array[i] ); + CleanupClosePushL( des ); + + if ( CMManager::ESnapPurposeInternet == + des.MetadataL( CMManager::ESnapMetadataPurpose ) ) + { + LOG( SIMPLE, "SATENGINE: CSatApnHandler::FindDefaultApL \ + the fixed destination is identified as 'Internet'" ); + for( TInt j = 0; ( j < des.ConnectionMethodCount() ) && + !isFound; ++j ) + { + cm = des.ConnectionMethodL( j ); + CleanupClosePushL( cm ); + pdpType = cm.GetIntAttributeL( + CMManager::EPacketDataPDPType ); + LOG2( SIMPLE, "SATENGINE: CSatApnHandler::FindDefaultApL \ + current protocol type is %d", pdpType ) + if ( pdpType == aPdpType ) + { + defaultIap = cm.GetIntAttributeL( CMManager::ECmIapId ); + isFound = ETrue; + LOG2( SIMPLE, "SATENGINE: CSatApnHandler::FindDefaultApL \ + default iap had been found %d", defaultIap ) + } + CleanupStack::PopAndDestroy( &cm ); + } + } + CleanupStack::PopAndDestroy( &des ); + } + CleanupStack::PopAndDestroy( &array ); + CleanupStack::PopAndDestroy( &cmManager ); + + if ( !isFound ) + { + LOG( SIMPLE, "SATENGINE: CSatApnHandler: default AP not found" ); + User::Leave( KErrNotFound ); + } + + LOG( SIMPLE, "SATENGINE: CSatApnHandler::FindDefaultApL exit" ) + return defaultIap; + } // End of File diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/Engine/src/CSatCommandContainer.cpp --- a/satengine/SatServer/Engine/src/CSatCommandContainer.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/Engine/src/CSatCommandContainer.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "MSatSystemState.h" #include "TSatSystemStateFactory.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/Engine/src/CSatSUiSubSession.cpp --- a/satengine/SatServer/Engine/src/CSatSUiSubSession.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/Engine/src/CSatSUiSubSession.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include "CSatSUiSubSession.h" #include "CSatSSession.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SatClient/src/CSatAllowRefreshMonitor.cpp --- a/satengine/SatServer/SatClient/src/CSatAllowRefreshMonitor.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SatClient/src/CSatAllowRefreshMonitor.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "CSatAllowRefreshMonitor.h" #include "msatrefreshobserver.h" -#include "RSatRefresh.h" +#include "rsatrefresh.h" #include "SatLog.h" // ============================ MEMBER FUNCTIONS =============================== diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SatClient/src/CSatRefreshMonitor.cpp --- a/satengine/SatServer/SatClient/src/CSatRefreshMonitor.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SatClient/src/CSatRefreshMonitor.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include -#include +#include +#include #include "CSatRefreshMonitor.h" #include "SatLog.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SatClient/src/RSatRefresh.cpp --- a/satengine/SatServer/SatClient/src/RSatRefresh.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SatClient/src/RSatRefresh.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES -#include -#include +#include +#include #include "SatSOpcodes.h" #include "CSatAllowRefreshMonitor.h" #include "CSatRefreshMonitor.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SatClient/src/RSatSession.cpp --- a/satengine/SatServer/SatClient/src/RSatSession.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SatClient/src/RSatSession.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include #include "SatSOpcodes.h" #include "SatServerFactory.h" #include "SatLog.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SatClient/src/rsatservice.cpp --- a/satengine/SatServer/SatClient/src/rsatservice.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SatClient/src/rsatservice.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "tsatinternaliconinfo.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SatInternalClient/src/RSatUiSession.cpp --- a/satengine/SatServer/SatInternalClient/src/RSatUiSession.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SatInternalClient/src/RSatUiSession.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include #include "RSatUiSession.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/SystemState/src/CSatSystemState.cpp --- a/satengine/SatServer/SystemState/src/CSatSystemState.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/SystemState/src/CSatSystemState.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -24,13 +24,12 @@ #include #include #include -#include +#include #include #include #include #include #include -#include #include "SATInternalPSKeys.h" #include "CSatSystemState.h" diff -r a19c8664496d -r ba42c4bd84dd satengine/SatServer/inc/MSatApnHandler.h --- a/satengine/SatServer/inc/MSatApnHandler.h Wed Mar 31 22:34:38 2010 +0300 +++ b/satengine/SatServer/inc/MSatApnHandler.h Wed Apr 14 16:32:24 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -76,6 +76,13 @@ */ virtual void DeleteApnL( TUint32 aApnId ) = 0; + /** + * Find the default APN Id + * @param aPdpType, indicates the address type is IPv4 or IPv6 + * @return a default iap id + */ + virtual TUint32 FindDefaultApL( + const RPacketContext::TProtocolType& aPdpType ) = 0; private: // Prohibit copy constructor if not deriving from CBase. diff -r a19c8664496d -r ba42c4bd84dd satui/satapp/SATUIInc/CSatUiActionPerformer.h --- a/satui/satapp/SATUIInc/CSatUiActionPerformer.h Wed Mar 31 22:34:38 2010 +0300 +++ b/satui/satapp/SATUIInc/CSatUiActionPerformer.h Wed Apr 14 16:32:24 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include #include diff -r a19c8664496d -r ba42c4bd84dd satui/satapp/SATUISrc/CSatUiViewAppUi.cpp --- a/satui/satapp/SATUISrc/CSatUiViewAppUi.cpp Wed Mar 31 22:34:38 2010 +0300 +++ b/satui/satapp/SATUISrc/CSatUiViewAppUi.cpp Wed Apr 14 16:32:24 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -110,6 +110,10 @@ const TUint8 KKeyNine = 0x39; const TUint8 KHwAsterisk = 0x2a; // In hw scan code value for asterisk +// The max volume value from settings. +// From TProfileToneSettings.h +const TInt KMaxVolumeFromProfile( 10 ); + // ================= MEMBER FUNCTIONS ======================= // C++ default constructor can NOT contain any code, that @@ -1559,6 +1563,8 @@ TInt volume( iPlayer->MaxVolume() ); iPlayer->SetVolume( volume ); + TFLOGSTRING2( "CSatUiViewAppUi::PlayStandardToneL SetVolume %d", + volume ) iPlayer->PrepareToPlayDesSequence( aSequence ); @@ -3221,6 +3227,22 @@ const TProfileToneSettings& ts = tones.ToneSettings(); iWarningAndPlayTones = ts.iWarningAndGameTones; iVolume = ts.iRingingVolume; + TFLOGSTRING2( "CSatUiViewAppUi::GetProfileParamsL \ + iVolume before mapping %d", iVolume ) + + // Max volume from profile is KMaxVolumeFromProfile, Max volume from + // CMdaAudioToneUtility is different, maybe 10,000. So, + // rate = maxVolumeFromPlayer / KMaxVolumeFromProfile + // User may never hear the TONE, because volume is too small. + // iVolume times the rate make it can be heard. + + CMdaAudioToneUtility* toneUtl = CMdaAudioToneUtility::NewL( *this ); + TInt maxVolumeFromPlayer( toneUtl->MaxVolume() ); + iVolume *= maxVolumeFromPlayer / KMaxVolumeFromProfile; + delete toneUtl; + toneUtl = NULL; + TFLOGSTRING2( "CSatUiViewAppUi::GetProfileParamsL \ + iVolume after mapping %d", iVolume ) if ( ( ESatUserSelectedToneIncomingSms == aTone ) && ( aToneName ) ) {