--- a/cellular/SSSettings/group/bld.inf Mon Mar 15 12:42:43 2010 +0200
+++ b/cellular/SSSettings/group/bld.inf Wed Mar 31 22:34:38 2010 +0300
@@ -24,7 +24,7 @@
PRJ_EXPORTS
../inc/CSSSettingsRefreshContainer.h |../../../inc/csssettingsrefreshcontainer.h
-../inc/MSSSettingsRefreshHandler.h |../../../inc/msssettingsrefreshhandler.h
+../inc/MSSSettingsRefreshHandler.h |../../../inc/MSSSettingsRefreshHandler.h
../group/SSSettings_stub.SIS /epoc32/data/z/system/install/sssettings_stub.sis
--- a/cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp Mon Mar 15 12:42:43 2010 +0200
+++ b/cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp Wed Mar 31 22:34:38 2010 +0300
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include "PSetRefreshHandlerImpl.h"
#include <etelmm.h>
-#include <msssettingsrefreshhandler.h>
+#include <MSSSettingsRefreshHandler.h>
#include <csssettingsrefreshcontainer.h>
#include <PsetCSP.h>
#include "PhoneSettingsLogger.h"
--- a/engines/vmbxengine/src/vmnumber.cpp Mon Mar 15 12:42:43 2010 +0200
+++ b/engines/vmbxengine/src/vmnumber.cpp Wed Mar 31 22:34:38 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"
@@ -171,7 +171,6 @@
iSynchronize( EFalse ),
iType( EVmbxNone ),
iVMSimQueryDialog( NULL ),
- iUSimSupport( EFalse ),
iVideoQuery( NULL ),
iTypeSelectionQuery( NULL ),
iAlphaStringFound( EFalse ),
@@ -392,10 +391,9 @@
TInt nValue;
psErr = property.Get( nValue );
TBool simStatus = EFalse;
- iUSimSupport = IsUsimSupport();
- VMBLOGSTRING2( "iUSimSupport = %d", iUSimSupport );
- // Sim aceess test on startup
- iStartUpTest = ETrue;
+
+ // Sim aceess test on startup
+ iStartUpTest = ETrue;
#ifdef RD_STARTUP_CHANGE
if ( ( FeatureManager::FeatureSupported( KFeatureIdSimCard ) )
@@ -412,86 +410,31 @@
simStatus = ETrue;
}
#endif // RD_STARTUP_CHANGE
- if ( FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma ) )
- {
- if ( iUSimSupport )
- {
- simStatus = ETrue;
- }
- }
VMBLOGSTRING2( "simStatus = %d", simStatus );
if ( simStatus )//Is simCard supproted and it is not removed
{
iSimCardFound = ETrue;
- // If UICC supported, then open USIM phone book.
- if ( iUSimSupport )
+
+ // Get identifiers from MBI-file
+ if ( EAlsLine1 == alsline )
{
- iMbdnPhonebookOk = EFalse;
- // Get identifiers from MBI-file
- if ( EAlsLine1 == alsline )
+ result = MailboxNumbersIdentifiers();
+ VMBLOGSTRING2( "Identifier result = %d", result );
+ if ( KErrPathNotFound == result )
{
- result = MailboxNumbersIdentifiers();
- VMBLOGSTRING2( "Identifier result = %d", result );
- if ( KErrPathNotFound == result )
- {
- // try open vmbx-phonebook next
- iPhoneBookType = EVMBXPhoneBook;
- }
- else
+ // try open vmbx-phonebook next
+ iPhoneBookType = EVMBXPhoneBook;
+ }
+ else
+ {
+ iPhoneBookType = EMBDNPhoneBook;
+ // set ALS line, if identifier reading returns -1
+ if ( KErrNotFound == result )
{
- iPhoneBookType = EMBDNPhoneBook;
- // set ALS line, if identifier reading returns -1
- if ( KErrNotFound == result )
- {
- iPhoneVoicemailInfo.iVoice = alsline;
- }
-
- // try to open mbdn-type phonebook
- result = iPhoneBook.Open( iPhone, KETelIccMbdnPhoneBook );
- VMBLOGSTRING2( "Mbdn phonebook opening result = %I ", result );
- if ( KErrNone == result )
- {
- // Get phonebook info
- result = PhoneBookInfo();
- }
- // close phonebook when error in opening or GetInfo
- if ( KErrNone != result )
- {
- VMBLOGSTRING( "Close MBDN phonebook" );
- iPhoneBook.Close();
- }
- // close phonebook when no number founf to test vmbx-phonebook
- else if ( ( KErrNone == result ) && iNoNumberFound )
- {
- VMBLOGSTRING( "mbdn close, number not found" );
- iMbdnPhonebookOk = ETrue;
- iPhoneBook.Close();
- // try open vmbx-phonebook next
- iPhoneBookType = EVMBXPhoneBook;
- }
+ iPhoneVoicemailInfo.iVoice = alsline;
}
- }
-
- if ( EAlsLine2 == alsline || EVMBXPhoneBook == iPhoneBookType )
- {
- // try to open vmbx-type phonebook
- result = iPhoneBook.Open( iPhone, KETelIccVoiceMailBox );
- VMBLOGSTRING2( "Vmbx phonebook opening result = %I ", result );
- if ( KErrNone == result )
- {
- // check that this phonebook supports reading
- result = PhoneBookInfo();
- VMBLOGSTRING( "VmbxPhoneBook opened" );
- }
- }
- // reopen mbdn-phonebook when vmbx-phonebook has no number
- if ( iMbdnPhonebookOk && iNoNumberFound )
- {
- VMBLOGSTRING( "reopen mbdn" );
- iPhoneBook.Close();
- // try open vmbx-phonebook next
- iPhoneBookType = EMBDNPhoneBook;
+
// try to open mbdn-type phonebook
result = iPhoneBook.Open( iPhone, KETelIccMbdnPhoneBook );
VMBLOGSTRING2( "Mbdn phonebook opening result = %I ", result );
@@ -499,6 +442,8 @@
{
// Get phonebook info
result = PhoneBookInfo();
+ VMBLOGSTRING2( "Mbdn phonebook opening again \
+ result = %I ", result );
}
// close phonebook when error in opening or GetInfo
if ( KErrNone != result )
@@ -506,22 +451,53 @@
VMBLOGSTRING( "Close MBDN phonebook" );
iPhoneBook.Close();
}
+ // close phonebook when no number founf to test vmbx-phonebook
+ else if ( ( KErrNone == result ) && iNoNumberFound )
+ {
+ VMBLOGSTRING( "mbdn close, number not found" );
+ iMbdnPhonebookOk = ETrue;
+ iPhoneBook.Close();
+ // try open vmbx-phonebook next
+ iPhoneBookType = EVMBXPhoneBook;
+ }
+ }
+ }
+
+ if ( EAlsLine2 == alsline || EVMBXPhoneBook == iPhoneBookType )
+ {
+ // try to open vmbx-type phonebook
+ result = iPhoneBook.Open( iPhone, KETelIccVoiceMailBox );
+ VMBLOGSTRING2( "Vmbx phonebook opening result = %I ", result );
+ if ( KErrNone == result )
+ {
+ // check that this phonebook supports reading
+ result = PhoneBookInfo();
+ VMBLOGSTRING( "VmbxPhoneBook opened" );
}
}
- // open SIM book
- else
- {
- // No need to prevent for changing memory location
- iUSimFirstRoundTest = EFalse;
- result = iPhoneBook.Open( iPhone, KETelIccVoiceMailBox );
- iPhoneBookType = EVMBXPhoneBook;
- VMBLOGSTRING( "VmbxPhoneBook opened" );
-
- if ( KErrNone == result )
- {
- result = PhoneBookInfo();
- }
- }
+ // reopen mbdn-phonebook when vmbx-phonebook has no number
+ if ( iMbdnPhonebookOk && iNoNumberFound )
+ {
+ VMBLOGSTRING( "reopen mbdn" );
+ iPhoneBook.Close();
+ // try open vmbx-phonebook next
+ iPhoneBookType = EMBDNPhoneBook;
+ // try to open mbdn-type phonebook
+ result = iPhoneBook.Open( iPhone, KETelIccMbdnPhoneBook );
+ VMBLOGSTRING2( "Mbdn phonebook opening result = %I ", result );
+ if ( KErrNone == result )
+ {
+ // Get phonebook info
+ result = PhoneBookInfo();
+ }
+ // close phonebook when error in opening or GetInfo
+ if ( KErrNone != result )
+ {
+ VMBLOGSTRING( "Close MBDN phonebook" );
+ iPhoneBook.Close();
+ }
+ }
+
// set readonly state if aquired
if ( IsReadOnlySIM() )
@@ -3460,41 +3436,6 @@
// -----------------------------------------------------------------------------
// RVmbxNumber::IsUsimSupport
// -----------------------------------------------------------------------------
-TBool RVmbxNumber::IsUsimSupport()
- {
- VMBLOGSTRING( "VMBX: RVmbxNumber::IsUsimSupport: =>" );
- TBool ret( EFalse );
- TInt alsline( EAlsLine1 );
-
- // get the current ALS line
- if ( GetAlsLine( alsline ) != KErrNone )
- {
- alsline = EAlsLine1; // if problems, assume primary line
- }
-
- // SIM access not supported for ALS line2
- if ( FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma ) &&
- ( alsline == EAlsLine1 ) )
- {
- TUint32 capability;
- TInt err = iPhone.GetIccAccessCaps( capability );
- VMBLOGSTRING3( "VMBX: RVmbxNumber::IsUsimSupport: Err = %I,\
- Capa = %I ", err, capability );
-
- if ( ( err == KErrNone ) &&
- ( capability & RMobilePhone::KCapsUSimAccessSupported ) )
- {
- VMBLOGSTRING( "USim access caps ok");
- ret = ETrue;
- }
- }
- else
- {
- ret = EFalse;
- }
- VMBLOGSTRING( "VMBX: RVmbxNumber::IsUsimSupport: <=" );
- return ret;
- }
// -----------------------------------------------------------------------------
// Series 60 Customer / MSatRefreshOserver
--- a/nwnotifier/group/nwnotifier.mmp Mon Mar 15 12:42:43 2010 +0200
+++ b/nwnotifier/group/nwnotifier.mmp Wed Mar 31 22:34:38 2010 +0300
@@ -15,6 +15,7 @@
*
*/
+#include <data_caging_paths.hrh>
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
--- a/nwnotifier/inc/networknotifiernotewrapper.h Mon Mar 15 12:42:43 2010 +0200
+++ b/nwnotifier/inc/networknotifiernotewrapper.h Wed Mar 31 22:34:38 2010 +0300
@@ -30,7 +30,7 @@
// CONSTANTS
-_LIT( KResFile, "\\resource\\NWNotifier_0x20026826.rsc" );
+_LIT( KResFile, "\\resource\\apps\\NWNotifier_0x20026826.rsc" );
// OBSERVER DECLARATION
--- a/nwnotifier/rom/nwnotifierresources.iby Mon Mar 15 12:42:43 2010 +0200
+++ b/nwnotifier/rom/nwnotifierresources.iby Wed Mar 31 22:34:38 2010 +0300
@@ -18,7 +18,9 @@
#ifndef NWNOTIFIERRESOURCES_IBY
#define NWNOTIFIERRESOURCES_IBY
-data = DATAZ_\RESOURCE_FILES_DIR\NWNotifier_0x20026826.rsc RESOURCE_FILES_DIR\NWNotifier_0x20026826.rsc
+#include <data_caging_paths_for_iby.hrh>
+
+data = DATAZ_\APP_RESOURCE_DIR\NWNotifier_0x20026826.rsc APP_RESOURCE_DIR\NWNotifier_0x20026826.rsc
#endif // NWNOTIFIERRESOURCES_IBY
--- a/package_definition.xml Mon Mar 15 12:42:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
- <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
- <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
- <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
- </component>
- </collection>
- <collection id="cbs" name="Cellular Baseband Services" level="plugin">
- <component id="cbsserver" filter="s60" name="CBS Server">
- <unit bldFile="cbs/cbsserver/group"/>
- </component>
- <component id="cbsui" filter="s60" name="CBS UI">
- <unit bldFile="cbs/cbsui/group"/>
- </component>
- </collection>
- <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
- <component id="callprovider" filter="s60" name="Call Provider">
- <unit bldFile="convergedcallengine/callprovider/group"/>
- </component>
- <component id="cce" filter="s60" name="CCE">
- <unit bldFile="convergedcallengine/cce/group"/>
- </component>
- <component id="spsettings" filter="s60" name="Service Provider Settings">
- <unit bldFile="convergedcallengine/spsettings/group"/>
- <!-- include the rest in the above? -->
- <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
- </component>
- <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
- <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
- </component>
- <component id="serviceselector" filter="s60" name="Service Selector">
- <unit bldFile="convergedcallengine/serviceselector/group"/>
- </component>
- <component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
- <!-- should spell out CS in name -->
- <unit bldFile="convergedcallengine/csplugin/group"/>
- </component>
- </collection>
- <collection id="networkhandling" name="Network Handling" level="plugin">
- <component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
- <unit bldFile="networkhandling/networkhandlingengine/group"/>
- </component>
- </collection>
- <collection id="phoneclientserver" name="Phone Client/Server" level="server">
- <component id="enpolicy" filter="s60" name="Emergency Number Policy">
- <unit bldFile="phoneclientserver/enpolicy/group"/>
- </component>
- <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
- <unit bldFile="phoneclientserver/aiwdialdata/group"/>
- </component>
- <component id="dialutils" filter="s60" name="Dial Utils">
- <unit bldFile="phoneclientserver/dialutils/group"/>
- </component>
- <component id="phoneclient" filter="s60" name="Phone Client">
- <unit bldFile="phoneclientserver/phoneclient/group"/>
- </component>
- <component id="phoneserver" filter="s60" name="Phone Server">
- <unit bldFile="phoneclientserver/phoneserver/group"/>
- </component>
- <component id="callui" filter="s60" name="Call UI">
- <unit bldFile="phoneclientserver/callui/group"/>
- </component>
- </collection>
- <collection id="satengine" name="SAT Engine" level="generic">
- <component id="satserver" filter="s60" name="SAT Server">
- <unit bldFile="satengine/satserver/group"/>
- </component>
- </collection>
- <collection id="satui" name="SIM Application Toolkit UI" level="specific">
- <component id="satapp" filter="s60" name="SAT Application">
- <unit bldFile="satui/satapp/group"/>
- </component>
- <component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
- <unit bldFile="satui/satplugin/group"/>
- </component>
- </collection>
- <collection id="telutils" name="Telephony Utils" level="generic">
- <component id="phoneparser" filter="s60" name="Phone Parser">
- <unit bldFile="telutils/phoneparser/group"/>
- </component>
- <component id="telephonyservice" filter="s60" name="Telephony Service">
- <unit bldFile="telutils/telephonyservice/group"/>
- </component>
- </collection>
- <collection id="cellular" name="Cellular" level="server">
- <component id="telephonysettings" filter="s60" name="Telephony Settings">
- <unit bldFile="cellular/telephonysettings/group"/>
- </component>
- <component id="sssettings" filter="s60" name="Supplementary Service Settings">
- <unit bldFile="cellular/sssettings/group"/>
- </component>
- <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
- <unit bldFile="cellular/psetnotesui/group"/>
- </component>
- <component id="servicerequest" filter="s60" name="Service Request">
- <unit bldFile="cellular/servicerequest/group"/>
- </component>
- </collection>
- <collection id="engines" name="Telephony Engines" level="specific">
- <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
- <unit bldFile="engines/vmbxengine/group"/>
- </component>
- </collection>
- <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
- <component id="phonesrv_plat" filter="s60" name="Telephony and SIM Services Platform Interfaces" class="api">
- <unit bldFile="phonesrv_plat/group"/>
- <!-- include the rest in the above? -->
- <!-- <unit bldFile="phonesrv_plat/call_information_api/tsrc/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
- </component>
- <component id="phonesrv_pub" filter="s60" name="Telephony and SIM Services Public Interfaces" class="api">
- <unit bldFile="phonesrv_pub/group"/>
- </component>
- </collection>
- </package>
-</SystemDefinition>
--- a/phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h Mon Mar 15 12:42:43 2010 +0200
+++ b/phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h Wed Mar 31 22:34:38 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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"
@@ -1018,12 +1018,6 @@
* @param aDlg Query dialog
*/
void SetHeaderFromResourceL( TInt aResourceId, CAknQueryDialog& aDlg );
- /**
- * Checks whether there is support for USIM(WCDMA)
- * @since
- * @return ETrue if USim is used
- */
- TBool IsUsimSupport();
/**
* Subscribe SAT notifications
@@ -1333,9 +1327,6 @@
// Sim query dialog
CVMSimQueryDilaog* iVMSimQueryDialog;
- // USim supported when true
- TBool iUSimSupport;
-
// Text query dialog
CVmTextQueryDialog* iVideoQuery; // owned
--- a/satengine/SatServer/Commands/SendSSCmd/src/CSendSsHandler.cpp Mon Mar 15 12:42:43 2010 +0200
+++ b/satengine/SatServer/Commands/SendSSCmd/src/CSendSsHandler.cpp Wed Mar 31 22:34:38 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"
@@ -53,7 +53,7 @@
const TInt KSsOperationShowFDNLIst = 0x05;
const TInt KSsOperationPasswordRegistration = 0x06;
// Ss error
-const TInt KSsSimAtkCcRejected = 0x0D;
+const TInt KSsSimAtkCcRejected = 0x13;
const TInt KTwo = 2;
// ======== MEMBER FUNCTIONS ========
--- a/satengine/SatServer/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Mon Mar 15 12:42:43 2010 +0200
+++ b/satengine/SatServer/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Wed Mar 31 22:34:38 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2007 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"
@@ -739,6 +739,16 @@
iSendUssdRsp.iAdditionalInfo.SetLength( 1 );
iSendUssdRsp.iAdditionalInfo[0] = RSat::KNoSpecificMeProblem;
}
+ else if ( KErrSatBusy == aError )
+ {
+ LOG( SIMPLE,
+ "SENDUSSD: CSendUssdHandler::HandleSendUssdResult \
+ KInteractionWithCCTemporaryError" )
+ iSendUssdRsp.iGeneralResult = RSat::KInteractionWithCCTemporaryError;
+ iSendUssdRsp.iInfoType = RSat::KNoAdditionalInfo;
+ iSendUssdRsp.iAdditionalInfo.SetLength( 0 );
+ iSendUssdRsp.iAdditionalInfo.Zero();
+ }
else if ( KErrNone == aError ) // Success case
{
LOG( SIMPLE,
--- a/satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp Mon Mar 15 12:42:43 2010 +0200
+++ b/satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp Wed Mar 31 22:34:38 2010 +0300
@@ -21,7 +21,7 @@
#include <centralrepository.h>
#include <MediatorDomainUIDs.h>
#include <MediatorEventProvider.h>
-#include <secondarydisplay/secondarydisplaysatapi.h>
+#include <SecondaryDisplay/secondarydisplaysatapi.h>
#include "SATPrivateCRKeys.h"
#include "csatmediatoreventprovider.h"
--- a/satengine/SatServer/inc/CSatCommandHandler.h Mon Mar 15 12:42:43 2010 +0200
+++ b/satengine/SatServer/inc/CSatCommandHandler.h Wed Mar 31 22:34:38 2010 +0300
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <etelsat.h>
-#include <secondarydisplay/secondarydisplaysatapi.h>
+#include <SecondaryDisplay/secondarydisplaysatapi.h>
#include "MSatUtils.h"
#include "MSatEventObserver.h"
#include "MSatCommand.h"