--- a/smsprotocols/smsstack/smsu/group/smsu.rss Mon May 03 13:37:20 2010 +0300
+++ b/smsprotocols/smsstack/smsu/group/smsu.rss Fri May 14 17:02:16 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -15,5 +15,7 @@
STRUCT MinDiskSpaceHolder { LONG value; }
-RESOURCE MinDiskSpaceHolder r_lowlimit_diskspace_holder { value = 8192; }
-RESOURCE MinDiskSpaceHolder r_highlimit_diskspace_holder { value = 16384; }
+// Nokia : normal sms level linked to critical level in SystemWarningLevels.hrh,
+// class 0 sms level agreed to be 20K.
+RESOURCE MinDiskSpaceHolder r_lowlimit_diskspace_holder { value = 20480; }
+RESOURCE MinDiskSpaceHolder r_highlimit_diskspace_holder { value = 131072; }
--- a/telephonyprotocols/pdplayer/group/bld.inf Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/bld.inf Fri May 14 17:02:16 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -30,7 +30,7 @@
PRJ_TESTMMPFILES
-#include "..\test\controlplane\group\bld.inf"
+#include "../test/controlplane/group/BLD.INF"
#endif
--- a/telephonyprotocols/pdplayer/group/pdp.mmp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/pdp.mmp Fri May 14 17:02:16 2010 +0300
@@ -25,6 +25,9 @@
UID 0x10009D8D 0x102822EF
VENDORID 0x70000001
+//PDP logging in commsdbg.ini is enabled with 'LOG SPUD *'
+MACRO _INFO_LOG
+MACRO _ERROR_LOG
SOURCEPATH ../src
SOURCE PDPSCPRStates.cpp
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_SpudUnit.iby Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_SpudUnit.iby Fri May 14 17:02:16 2010 +0300
@@ -18,7 +18,7 @@
#ifndef __TE_SPUD_UNIT_IBY__
#define __TE_SPUD_UNIT_IBY__
-file=ABI_DIR\BUILD_DIR\TE_SpudUnit.exe System\Libs\TE_SpudUnit.exe
+file=ABI_DIR\DEBUG_DIR\TE_SpudUnit.exe System\Libs\TE_SpudUnit.exe
data=EPOCROOT##epoc32\data\z\testdata\configs\Spud_config.txt TestData\configs\Spud_config.txt
data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudUnitTest.script TestData\scripts\TE_SpudUnitTest.script
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby Fri May 14 17:02:16 2010 +0300
@@ -20,7 +20,7 @@
REM Feature QoS is not included in this ROM
REM Temporary patch
#else
-file=ABI_DIR\BUILD_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe
+file=ABI_DIR\DEBUG_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe
#endif
data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide.script testdata\scripts\TE_SpudNetworkSide.script
--- a/telephonyprotocols/rawipnif/group/RawIPNif.mmp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/RawIPNif.mmp Fri May 14 17:02:16 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -37,6 +37,8 @@
// DEFFILE RawIp.def
+MACRO __BTT_LOGGING__
+
SOURCEPATH ../src
SOURCE RawIPFlow.cpp
--- a/telephonyprotocols/rawipnif/group/RawIPNif2.mmp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/RawIPNif2.mmp Fri May 14 17:02:16 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -31,6 +31,8 @@
// DEFFILE RawIp2.def
+MACRO __BTT_LOGGING__
+
SOURCEPATH ../rawipnif2/src
SOURCE BcaController.cpp
SOURCE BinderBase.cpp
--- a/telephonyprotocols/rawipnif/inc/bttlog.h Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/bttlog.h Fri May 14 17:02:16 2010 +0300
@@ -77,16 +77,22 @@
#endif // __BTT_LOG_3__
#ifdef __BTT_LOG_1__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
-#ifdef __BTT_LOG_2__
+#ifdef __BTT_LOG_2__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
-#ifdef __BTT_LOG_3__
+#ifdef __BTT_LOG_3__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOGGING__
#define _BTT_LEAVEIFERROR(a) iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/bttlog.h Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/bttlog.h Fri May 14 17:02:16 2010 +0300
@@ -77,16 +77,22 @@
#endif // __BTT_LOG_3__
#ifdef __BTT_LOG_1__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOG_2__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOG_3__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOGGING__
#define _BTT_LEAVEIFERROR(a) iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
--- a/telephonyprotocols/rawipnif/version1/inc/bttlog.h Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/rawipnif/version1/inc/bttlog.h Fri May 14 17:02:16 2010 +0300
@@ -77,16 +77,22 @@
#endif // __BTT_LOG_3__
#ifdef __BTT_LOG_1__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOG_2__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOG_3__
+#ifndef __BTT_LOGGING__
#define __BTT_LOGGING__
#endif
+#endif
#ifdef __BTT_LOGGING__
#define _BTT_LEAVEIFERROR(a) iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby Fri May 14 17:02:16 2010 +0300
@@ -20,7 +20,7 @@
REM Feature QoS is not included in this ROM
REM Temporary patch
#else
-file=ABI_DIR\BUILD_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe
+file=ABI_DIR\DEBUG_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe
#endif
data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide.script testdata\scripts\TE_SpudNetworkSide.script
--- a/telephonyserver/etelserverandcore/INC/ET_PHONE.H Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserver/etelserverandcore/INC/ET_PHONE.H Fri May 14 17:02:16 2010 +0300
@@ -53,7 +53,10 @@
static TAny* operator new(TUint aSize,RHeap* aHeap) __NO_THROW; // for a priority client request, the
// objects created must all be taken from
// the priority heap.
- static void operator delete(TAny* aPtr);
+ static void operator delete(TAny* aPtr);
+ static void operator delete(TAny* aPtr, TLeave aLeave);
+ static void operator delete(TAny* aPtr, TUint aExtraSize);
+ static void operator delete(TAny* aPtr, RHeap* aHeap);
public:
TTsyReqHandle iTsyReqHandle;
@@ -111,7 +114,10 @@
static TAny* operator new(TUint aSize,TLeave aLeave);
static TAny* operator new(TUint aSize,TUint aExtraSize) __NO_THROW;
static TAny* operator new(TUint aSize,RHeap* aHeap) __NO_THROW;
- static void operator delete(TAny* aPtr);
+ static void operator delete(TAny* aPtr);
+ static void operator delete(TAny* aPtr, TLeave aLeave);
+ static void operator delete(TAny* aPtr, TUint aExtraSize);
+ static void operator delete(TAny* aPtr, RHeap* aHeap);
public:
HEtelBufC8* iBuf8; // ptr to buffer if narrow
--- a/telephonyserver/etelserverandcore/INC/ET_PHONE.INL Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserver/etelserverandcore/INC/ET_PHONE.INL Fri May 14 17:02:16 2010 +0300
@@ -43,3 +43,52 @@
return iBufferFull;
}
+
+inline void CReqEntry::operator delete(TAny* aPtr, TLeave )
+//
+// overloaded delete - to prevent warning
+//
+ {
+ operator delete(aPtr);
+ }
+
+inline void CReqEntry::operator delete(TAny* aPtr, RHeap *)
+//
+// overloaded delete - to prevent warning
+//
+ {
+ operator delete(aPtr);
+ }
+
+inline void CReqEntry::operator delete(TAny* aPtr, TUint )
+//
+// overloaded delete - to prevent warning
+//
+ {
+ operator delete(aPtr);
+ }
+
+
+inline void CBuffer::operator delete(TAny* aPtr, TLeave )
+//
+// overloaded delete - to prevent warning
+//
+ {
+ operator delete(aPtr);
+ }
+
+inline void CBuffer::operator delete(TAny* aPtr, RHeap *)
+//
+// overloaded delete - to prevent warning
+//
+ {
+ operator delete(aPtr);
+ }
+
+inline void CBuffer::operator delete(TAny* aPtr, TUint )
+//
+// overloaded delete - to prevent warning
+//
+ {
+ operator delete(aPtr);
+ }
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Fri May 14 17:02:16 2010 +0300
@@ -2482,12 +2482,12 @@
// Reset tsy request handle
iTsyReqHandleStore->ResetTsyReqHandle( iReqHandleType );
- // Complete request with KErrCancel
- CMmPacketServiceTsy::ReqCompleted( aTsyReqHandle, KErrCancel );
-
// We've finished with this value now. Clear it so it doesn't leak
// up to any other instances of this method down the call stack
iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
+
+ // Complete request with KErrCancel
+ CMmPacketServiceTsy::ReqCompleted( aTsyReqHandle, KErrCancel );
}
return ret;
--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsypacketservicefu.h Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsypacketservicefu.h Fri May 14 17:02:16 2010 +0300
@@ -50,7 +50,8 @@
void TestNotifyContextAdded0004L();
void TestNotifyStatusChange0001L();
void TestNotifyStatusChange0002L();
- void TestNotifyStatusChange0004L();
+ void TestNotifyStatusChange0004L();
+ void TestNotifyStatusChange0004aL();
void TestNotifyStatusChange0001aL();
void TestSetPreferredBearer0001L();
void TestSetPreferredBearer0004L();
--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script Fri May 14 17:02:16 2010 +0300
@@ -112,6 +112,18 @@
RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketServiceFU.TestNotifyStatusChange0004L
END_TESTCASE BA-CTSY-PKTS-PSNSC-0004
+START_TESTCASE BA-CTSY-PKTS-PSNSC-0004a
+//!@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0004a
+//!@SYMPREQ 1551
+//!@SYMComponent telephony_ctsy
+//!@SYMTestCaseDesc Test support in CTSY for multiple client requests and cancel to RPacketService::NotifyStatusChange
+//!@SYMTestPriority High
+//!@SYMTestActions Invokes multiple client requests and cancel to RPacketService::NotifyStatusChange
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketServiceFU.TestNotifyStatusChange0004aL
+END_TESTCASE BA-CTSY-PKTS-PSNSC-0004a
+
START_TESTCASE BA-CTSY-PKTS-PSNSC-0001a
//!@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0001a
//!@SYMPREQ 1551
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsypacketservicefu.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsypacketservicefu.cpp Fri May 14 17:02:16 2010 +0300
@@ -39,6 +39,8 @@
#define MBMS_MONITORSERVICECOUNTONE 1
#define MBMS_MONITORSERVICECOUNTMULTIPLE 3
+const TInt KOneSecond=1000000; // Used in a time out function, 1 second (in microSeconds)
+
CTestSuite* CCTsyPacketServiceFU::CreateSuiteL(const TDesC& aName)
{
SUB_SUITE;
@@ -50,7 +52,8 @@
ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyContextAdded0004L);
ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0001L);
ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0002L);
- ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0004L);
+ ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0004L);
+ ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0004aL);
ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0001aL);
ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestSetPreferredBearer0001L);
ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestSetPreferredBearer0004L);
@@ -892,6 +895,97 @@
}
/**
+@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0004a
+@SYMPREQ 1551
+@SYMComponent telephony_ctsy
+@SYMTestCaseDesc Test support in CTSY for multiple client requests to RPacketService::NotifyStatusChange
+@SYMTestPriority High
+@SYMTestActions Invokes multiple client requests to RPacketService::NotifyStatusChange
+@SYMTestExpectedResults Pass
+@SYMTestType CT
+*/
+void CCTsyPacketServiceFU::TestNotifyStatusChange0004aL()
+ {
+
+ OpenEtelServerL(EUseExtendedError);
+ CleanupStack::PushL(TCleanupItem(Cleanup,this));
+ OpenPhoneL();
+
+ RBuf8 data;
+ CleanupClosePushL(data);
+
+ // Open second client
+ RTelServer telServer2;
+ TInt ret = telServer2.Connect();
+ ASSERT_EQUALS(KErrNone, ret);
+ CleanupClosePushL(telServer2);
+
+ RMobilePhone phone2;
+ ret = phone2.Open(iTelServer,KMmTsyPhoneName);
+ ASSERT_EQUALS(KErrNone, ret);
+ CleanupClosePushL(phone2);
+
+ RPacketService packetService;
+ OpenPacketServiceL(packetService);
+ CleanupClosePushL(packetService);
+
+ RPacketService packetService2;
+ ret = packetService2.Open(phone2);
+ ASSERT_EQUALS(KErrNone, ret);
+ CleanupClosePushL(packetService2);
+
+ //-------------------------------------------------------------------------
+ // Test A: Test multiple clients requesting RPacketService::NotifyStatusChange
+ //-------------------------------------------------------------------------
+
+ // Data for CompleteL
+ RPacketService::TStatus sendStatus = RPacketService::EStatusAttached;
+ TBool isResumed = EFalse;
+ TMockLtsyData2 <RPacketService::TStatus, TBool > ltsyData(sendStatus, isResumed);
+ ltsyData.SerialiseL(data);
+
+ TRequestStatus requestStatus;
+ RPacketService::TStatus contextStatus;
+ // sent first request
+ packetService.NotifyStatusChange(requestStatus, contextStatus);
+
+ TRequestStatus requestStatus2;
+ RPacketService::TStatus contextStatus2;
+ // sent second request
+ packetService2.NotifyStatusChange(requestStatus2, contextStatus2);
+
+ // Issue the Complete...
+ iMockLTSY.CompleteL(EPacketNotifyStatusChange, KErrNone, data);
+
+ // wait for the first request
+ User::WaitForRequest(requestStatus);
+ ASSERT_EQUALS(KErrNone, requestStatus.Int());
+ ASSERT_EQUALS(sendStatus, contextStatus);
+ // wait for the second request
+ User::WaitForRequest(requestStatus2);
+ ASSERT_EQUALS(KErrNone, requestStatus2.Int());
+ ASSERT_EQUALS(sendStatus, contextStatus2);
+
+ AssertMockLtsyStatusL();
+
+ // Activate both clients again
+ packetService.NotifyStatusChange(requestStatus, contextStatus);
+ User::After(KOneSecond);
+ packetService2.NotifyStatusChange(requestStatus2, contextStatus2);
+ User::After(KOneSecond);
+
+ // Send cancel to the first client
+ packetService.CancelAsyncRequest(EPacketNotifyStatusChange);
+ User::WaitForRequest(requestStatus);
+ ASSERT_EQUALS(KErrCancel, requestStatus.Int());
+
+ AssertMockLtsyStatusL();
+
+ CleanupStack::PopAndDestroy(2); // packetService, packetService2
+ CleanupStack::PopAndDestroy(4, this); // phone2, telServer2, data, this
+ }
+
+/**
@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0001a
@SYMPREQ 1551
@SYMComponent telephony_ctsy
--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp Fri May 14 17:02:16 2010 +0300
@@ -210,7 +210,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingAllConditionalCases for EAllServices"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingAllConditionalCases, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingAllConditionalCases for EAllServices failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EAllServices"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EAllServices failed"));
@@ -398,7 +398,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ETelephony"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for ETelephony failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EVoiceService failed"));
@@ -430,7 +430,7 @@
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EFaxService failed"));
}
- else if(operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EFaxService failed"));
}
@@ -440,7 +440,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EShortMessageService"));
- if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
+ if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIncompatibility), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EShortMessageService failed"));
}
@@ -561,7 +561,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EAllServices and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -688,7 +688,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EAllServices and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -731,7 +731,7 @@
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EAuxVoiceService failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EAuxVoiceService failed"));
}
@@ -749,7 +749,7 @@
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIllegalOperation), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EPacketDataService failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EPacketDataService failed"));
}
@@ -762,7 +762,7 @@
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EFaxService failed"));
}
- else if(operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EFaxService failed"));
}
@@ -779,7 +779,7 @@
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EShortMessageService failed"));
}
- else if(operatorName==EOperatorO2)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EShortMessageService failed"));
}
@@ -911,7 +911,7 @@
{
CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSErrorStatus), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EAllServices failed"));
}
@@ -1081,7 +1081,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSErrorStatus), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed"));
@@ -1106,7 +1106,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EFaxService"));
- if(operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned ), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EFaxService failed"));
}
@@ -1119,7 +1119,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EShortMessageService"));
- if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
+ if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIncompatibility), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EShortMessageService failed"));
}
@@ -1239,7 +1239,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionActivate and aInfo.iServiceGroup=RMobilePhone::EAllServices, aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -1371,7 +1371,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
}
- else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
+ else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionActivate and aInfo.iServiceGroup=RMobilePhone::EAllServices, aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -1440,7 +1440,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for ETelephony"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for ETelephony failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EVoiceService failed"));
@@ -1465,7 +1465,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EFaxService"));
- if(operatorName==EOperatorO2 || operatorName==EOperatorOrange)
+ if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EFaxService failed"));
}
@@ -1478,7 +1478,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EShortMessageService"));
- if(operatorName==EOperatorO2 || operatorName==EOperatorTMobile)
+ if(operatorName==EOperatorO2 || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EShortMessageService failed"));
}
@@ -1626,7 +1626,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// === Register call forwarding unconditional for all services ===
@@ -1901,7 +1901,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -1997,7 +1997,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -2065,7 +2065,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNoReply for ECircuitDataService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNoReply), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNoReply for ECircuitDataService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNoReply for ECircuitDataService"));
@@ -2134,7 +2134,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNotReachable for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNotReachable), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNotReachable for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -2315,7 +2315,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -2551,7 +2551,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingBusy and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
@@ -2677,7 +2677,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNotReachable for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNotReachable), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNotReachable for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNotReachable for EVoiceService"));
@@ -2787,7 +2787,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNoReply for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNoReply), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNoReply for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNoReply for EVoiceService"));
@@ -2995,7 +2995,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with ECallForwardingUnconditional for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -3030,7 +3030,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with ECallForwardingUnconditional for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=different valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -3159,13 +3159,13 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingNoReply and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=10
// Check RMobilePhone::NotifyCallForwardingStatusChange completes with aCondition=ECallForwardingBusy
newSetting.iAction=RMobilePhone::EServiceActionRegister;
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingBusy for EVoiceService"));
- if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
+ if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingBusy for EVoiceService failed"));
}
@@ -3194,13 +3194,13 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingNoReply and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=different valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=20
// Check RMobilePhone::NotifyCallForwardingStatusChange completes with aCondition=ECallForwardingBusy
newSetting.iAction=RMobilePhone::EServiceActionRegister;
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingBusy for EVoiceService"));
- if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
+ if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
{
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingBusy for EVoiceService failed"));
}
@@ -3334,7 +3334,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
newSetting.iAction=RMobilePhone::EServiceActionRegister;
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
@@ -3373,7 +3373,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ECircuitDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -3401,7 +3401,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ECircuitDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -3429,7 +3429,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EPacketDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -3458,7 +3458,7 @@
DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony"));
ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed"));
}
- else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
+ else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
{
// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ETelephony and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ETelephony"));
--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp Fri May 14 17:02:16 2010 +0300
@@ -273,6 +273,7 @@
count = 1; //O2 supports only speech
break;
case EOperatorVodafone:
+ case EOperatorNTN:
case EOperatorOrange:
case EOperatorTMobile:
count = 4; //vodafone, orange and tmobile support speech, voice and data
@@ -814,6 +815,7 @@
count = 1; //O2 supports only speech
break;
case EOperatorVodafone:
+ case EOperatorNTN:
case EOperatorOrange:
case EOperatorTMobile:
count = 3; //vodafone, orange and tmobile support speech, voice and data
--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp Fri May 14 17:02:16 2010 +0300
@@ -489,11 +489,11 @@
// Start downloading a file via HTTP.
- TBuf<140> host(_L("developer.symbian.com"));
- TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf"));
+ TBuf<140> host(_L("developer.symbian.org"));
+ TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"));
CHTTPDownload* download = new (ELeave) CHTTPDownload(this);
CleanupStack::PushL(download);
- ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed"));
+ ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed - perhaps page has moved!"));
// Get context info
TExtEtelRequestStatus getContextInfo(packetService, EPacketGetContextInfo);
@@ -800,11 +800,11 @@
ASSERT_EQUALS(dialStatus.Int(), KErrNone, _L("RCall::Dial returned with an error"));
// Start downloading a file e.g. via HTTP.
- TBuf<140> host(_L("developer.symbian.com"));
- TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf"));
- CHTTPDownload *download = new (ELeave) CHTTPDownload(this);
+ TBuf<140> host(_L("developer.symbian.org"));
+ TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"));
+ CHTTPDownload* download = new (ELeave) CHTTPDownload(this);
CleanupStack::PushL(download);
- ASSERT_TRUE(download->StartDownloadL(host,page),_L("CHTTPDownload::StartDownloadL failed"));
+ ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed - perhaps page has moved!"));
// Verify file is downloading.
ASSERT_TRUE(download->VerifyDownloading(), _L("CHTTPDownload::VerifyDownloading did not return ETrue as expected. File is not downloaded."));
--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp Fri May 14 17:02:16 2010 +0300
@@ -12426,11 +12426,11 @@
// === Send and receive some data and check data transferred advances ===
// Activate context with ESOCK server
- TBuf<140> host(_L("developer.symbian.com"));
- TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf"));
+ TBuf<140> host(_L("developer.symbian.org"));
+ TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"));
CHTTPDownload *download = new (ELeave) CHTTPDownload(this);
CleanupStack::PushL(download);
- ASSERT_TRUE(download->StartDownloadL(host,page),_L("Download Failed"));
+ ASSERT_TRUE(download->StartDownloadL(host,page),_L("Download Failed - perhaps page has moved!"));
// Check RPacketService::GetNifInfo with aCount = 0 returns valid name in iContextName
TInt nifInfoCount = 0;
--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp Fri May 14 17:02:16 2010 +0300
@@ -76,6 +76,9 @@
case EOperatorVodafone:
network = &KNetworkVodafone;
break;
+ case EOperatorNTN:
+ network = &KNetworkNTN;
+ break;
case EOperatorOrange:
network = &KNetworkOrange;
break;
--- a/telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp Fri May 14 17:02:16 2010 +0300
@@ -24,8 +24,8 @@
// Declare a static, counter fot active downloads, to know when to open and close the server socket session
TInt CHTTPDownload::iActiveDownload = 0;
-_LIT(KDefaultHost, "www.smartphoneshow.com");
-_LIT(KDefaultPage, "/newt/l/downloads/symbian/presentations/Day1Pres1_NigelClifford_Symbian_keynote.pdf");
+_LIT(KDefaultHost, "developer.symbian.org");
+_LIT(KDefaultPage, "/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf");
const TInt KDefaultPort = 80;
const TInt KBufferSize = 4096;
--- a/telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp Fri May 14 17:02:16 2010 +0300
@@ -613,7 +613,8 @@
{
aOperatorName = EOperatorAnite;
}
- else if ( ptrNetworkName.Find(_L("NTN")) >=0 )
+ else if ( ptrNetworkName.Find(_L("NTN")) >=0
+ || ptrNetworkName.Find(_L("NOKIA")) >=0)
{
aOperatorName = EOperatorNTN;
}
--- a/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp Fri May 14 17:02:16 2010 +0300
@@ -82,7 +82,19 @@
{
// Request has completed with incorrect result. Consume any outstanding
// Repost notification until timeout or we get the right result.
-
+ DEBUG_PRINTF3(_L("State %d Expected %d waiting for correct state"), aContextStatus, aExpectedContextStatus);
+
+ if (RPacketContext::EStatusActive == aContextStatus)
+ {
+ // === NTN Failure ===
+ ERR_PRINTF1(_L("<font color=Orange>$NTNKnownFailure: Context Activation success (EStatusActive = 3)</font>"));
+ // Nothing else to wait for now!
+ // Deactivate the context with RPacketContext::Deactivate
+ TExtEtelRequestStatus contextDeactivateStatus(aPacketContext, EPacketContextDeactivate);
+ aPacketContext.Deactivate(contextDeactivateStatus);
+ User::Leave(iTestStep.WaitForRequestWithTimeOut(contextDeactivateStatus, ETimeLong));
+ }
+
aPacketContext.NotifyStatusChange(aRequestStatus, aContextStatus);
err = iTestStep.WaitForRequestWithTimeOut(aRequestStatus, ETimeVeryLong);
}
@@ -777,8 +789,13 @@
}
else if(ptrNetworkName.Find(_L("NTN")) != KErrNotFound) // NTN
{
- section.Copy(KIniSectionVodafoneGprs);
- DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
+ section.Copy(KIniSectionNTNGprs);
+ DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
+ }
+ else if(ptrNetworkName.Find(_L("NOKIA")) != KErrNotFound) // NTN
+ {
+ section.Copy(KIniSectionNTNGprs);
+ DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
}
else if( (ptrNetworkName.Find(_L("01")) >=0) ||
(ptrNetworkName.Find(_L("ANITE")) >=0) ) // Anite
--- a/telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini Fri May 14 17:02:16 2010 +0300
@@ -8,11 +8,11 @@
VoiceNumberInt1=99900
VoiceNumberIntExHC=99900
VoiceNumberDoesNotConnect=0
-SmsReceptor=01632960000
+SmsReceptor=+3584544109099
[DataNumbers]
-DataNumber1=01632960000
+DataNumber1=+3584544109099
DataNumber2=0
[FaxNumbers]
@@ -20,7 +20,7 @@
FaxNumber2=0
[OwnNumbers]
-OwnVoiceNumber1=
+OwnVoiceNumber1=+3584544268603
OwnVoiceNumber2=
OwnDataNumber=
OwnFaxNumber=
@@ -136,7 +136,7 @@
Pin2=
[NTNPasswords]
-CallBarring1=0000
+CallBarring1=1234
Pin1=1234
Pin2=5678
Puk1=11111111
@@ -153,7 +153,7 @@
NTN= +358454400051
[BoardParams]
-PhoneLock=
+PhoneLock=12345
[SIMParams]
Puk1=