telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp
branchRCL_3
changeset 6 fc69e1e37771
parent 5 7ef16719d8cb
child 7 fe8b59ab9fa0
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp	Fri Mar 12 15:49:38 2010 +0200
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp	Mon Mar 15 12:45:06 2010 +0200
@@ -2108,7 +2108,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 );
@@ -2124,21 +2135,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 )
                 {