--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp Fri Apr 16 16:12:37 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp Mon May 03 13:37:20 2010 +0300
@@ -2116,7 +2116,18 @@
RMobilePhone::TMobilePhoneRegistrationStatus* aStatus )
{
TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle);
- if ( RMobilePhone::ERegistrationUnknown == iNWRegistrationStatus )
+
+ // If the modem is not ready (Common TSY has not received EMmTsyBootNotifyModemStatusReadyIPC
+ // from LTSY), we don't need to ask. Update registration status and complete client immediately.
+ if (!iMmPhoneTsy->IsModemStatusReady())
+ {
+ iNWRegistrationStatus = RMobilePhone::ERegistrationUnknown;
+ *aStatus = iNWRegistrationStatus;
+ iMmPhoneTsy->ReqCompleted( aTsyReqHandle, KErrNone );
+ return KErrNone;
+ }
+
+ if (RMobilePhone::ERegistrationUnknown == iNWRegistrationStatus) // modem is ready
{
TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
GetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetNetworkRegistrationStatus );
@@ -2132,21 +2143,9 @@
}
else
{
- TInt ret(KErrGeneral);
- // verify that modem is ready
- if ( iMmPhoneTsy->IsModemStatusReady() )
- {
- //get mode specific information
- TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Sending request to LTSY" );
- ret = iMmPhoneTsy->iMmPhoneExtInterface->
- GetNetworkRegistrationStatusL();
- }
- else
- {
- // modem is not ready. Client to be completed with error code.
- TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Modem not ready" );
- ret = KErrNotReady;
- }
+ //get mode specific information
+ TInt ret ( iMmPhoneTsy->iMmPhoneExtInterface->
+ GetNetworkRegistrationStatusL() );
if ( KErrNone != ret )
{