103 } |
103 } |
104 |
104 |
105 // Destructor. |
105 // Destructor. |
106 EXPORT_C COMASUPLProtocolManager1::~COMASUPLProtocolManager1() |
106 EXPORT_C COMASUPLProtocolManager1::~COMASUPLProtocolManager1() |
107 { |
107 { |
108 if(iSettingsLauncher) |
108 /*if(iSettingsLauncher) |
109 { |
109 { |
110 iSettingsLauncher->CancelLaunch(); |
110 iSettingsLauncher->CancelLaunch(); |
111 } |
111 }*/ |
112 |
|
113 if(iSuplSettings) |
112 if(iSuplSettings) |
114 { |
113 { |
115 iSuplSettings->SetUIActive( EFalse ); |
114 iSuplSettings->SetUIActive( EFalse ); |
116 } |
115 } |
117 |
116 |
118 DeleteAllSessions(); |
117 DeleteAllSessions(); |
119 iSuplSessions.Reset(); |
118 iSuplSessions.Reset(); |
120 iSuplSessions.Close(); |
119 iSuplSessions.Close(); |
121 |
120 |
122 //Only attempt to unload the phone if the TSY has actually been initialised |
121 //Only attempt to unload the phone if the TSY has actually been initialised |
123 if(iTsyName.Length() > 0) |
122 if(iTsyName.Length() > 0) |
124 { |
123 { |
125 iTelServer.UnloadPhoneModule(iTsyName); |
124 iTelServer.UnloadPhoneModule(iTsyName); |
126 } |
125 } |
127 |
126 |
128 |
127 |
129 iQueuedPacket.Close(); |
128 iQueuedPacket.Close(); |
130 |
129 |
136 delete iSuplStorageSettings; |
135 delete iSuplStorageSettings; |
137 |
136 |
138 |
137 |
139 delete iSuplEcomEventWatcher; |
138 delete iSuplEcomEventWatcher; |
140 |
139 |
141 delete iSettingsLauncher; |
140 //delete iSettingsLauncher; |
142 delete iNotifier; |
141 delete iNotifier; |
143 iMobilePhone.Close(); |
142 iMobilePhone.Close(); |
144 iTelServer.Close(); |
143 iTelServer.Close(); |
145 iIMSI.Close(); |
144 iIMSI.Close(); |
146 iTrace->Trace(_L("At the End of COMASUPLProtocolManager1::~COMASUPLProtocolManager1"), |
145 iTrace->Trace(_L("At the End of COMASUPLProtocolManager1::~COMASUPLProtocolManager1"), |
174 User::LeaveIfError(err); |
173 User::LeaveIfError(err); |
175 |
174 |
176 iSuplStorageSettings = CSuplSettingsInternal::NewL(); |
175 iSuplStorageSettings = CSuplSettingsInternal::NewL(); |
177 iSuplStorageSettings->SetObserverL(*this); |
176 iSuplStorageSettings->SetObserverL(*this); |
178 |
177 |
179 iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this ); |
178 //iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this ); |
180 |
179 |
181 iIMSI.CreateL( KMaxIMSILen ); |
180 iIMSI.CreateL( KMaxIMSILen ); |
182 iIsPreviouslyDecodingFailed = EFalse; |
181 iIsPreviouslyDecodingFailed = EFalse; |
183 iTimer = COMASuplTimeoutTimer::NewL(*this); |
182 iTimer = COMASuplTimeoutTimer::NewL(*this); |
184 } |
183 } |
251 iCommManager = aCommManager; |
250 iCommManager = aCommManager; |
252 |
251 |
253 //Connect to ETel |
252 //Connect to ETel |
254 User::LeaveIfError(ConnectToETelL()); |
253 User::LeaveIfError(ConnectToETelL()); |
255 |
254 |
256 ReadSuplUsage(); |
255 //ReadSuplUsage(); |
257 |
256 |
258 if(iSuplEcomEventWatcher) |
257 if(iSuplEcomEventWatcher) |
259 { |
258 { |
260 iTrace->Trace(_L("NotifyOnPlugInUnInstallation starting"), KTraceFileName, __LINE__); |
259 iTrace->Trace(_L("NotifyOnPlugInUnInstallation starting"), KTraceFileName, __LINE__); |
261 iSuplEcomEventWatcher->NotifyOnPlugInUnInstallation(); |
260 iSuplEcomEventWatcher->NotifyOnPlugInUnInstallation(); |
529 |
528 |
530 //Last Session invoking Destroy |
529 //Last Session invoking Destroy |
531 iTrace->Trace(_L("COMASUPLProtocolManager1::DestroySession Destroy Session"), KTraceFileName, __LINE__); |
530 iTrace->Trace(_L("COMASUPLProtocolManager1::DestroySession Destroy Session"), KTraceFileName, __LINE__); |
532 |
531 |
533 COMASuplSession* OMASession = static_cast<COMASuplSession*>(aSuplSession); |
532 COMASuplSession* OMASession = static_cast<COMASuplSession*>(aSuplSession); |
534 if (OMASession->HasMeLaunchedUsageDialog()) |
|
535 { |
|
536 iTrace->Trace(_L("Setting NULL."), KTraceFileName, __LINE__); |
|
537 iSessnUIObserver = NULL; |
|
538 } |
|
539 if (OMASession->GetSessionUIFlag()) |
533 if (OMASession->GetSessionUIFlag()) |
540 { |
534 { |
541 OMASession->DestroySession(); |
535 OMASession->DestroySession(); |
542 iSessnUIObserver = NULL; |
536 iSessnUIObserver = NULL; |
543 } |
537 } |
1044 if(KErrNotFound == index) |
1038 if(KErrNotFound == index) |
1045 { |
1039 { |
1046 iTrace->Trace(_L("Cannot found Supl session."), KTraceFileName, __LINE__); |
1040 iTrace->Trace(_L("Cannot found Supl session."), KTraceFileName, __LINE__); |
1047 return; |
1041 return; |
1048 } |
1042 } |
1049 |
|
1050 COMASuplSession* OMASession = static_cast<COMASuplSession*>(aSuplSession); |
|
1051 if (OMASession->HasMeLaunchedUsageDialog()) |
|
1052 { |
|
1053 iTrace->Trace(_L("Setting NULL."), KTraceFileName, __LINE__); |
|
1054 iSessnUIObserver = NULL; |
|
1055 } |
|
1056 |
|
1057 aSuplSession->CancelRunSession(); |
1043 aSuplSession->CancelRunSession(); |
1058 return ; |
1044 return ; |
1059 } |
1045 } |
1060 |
1046 |
1061 |
1047 |
1201 void COMASUPLProtocolManager1::HandleSuplSettingsChangeL(TSuplSettingsEventType aEvent,TInt /*aSlpId*/) |
1187 void COMASUPLProtocolManager1::HandleSuplSettingsChangeL(TSuplSettingsEventType aEvent,TInt /*aSlpId*/) |
1202 { |
1188 { |
1203 if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange) |
1189 if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange) |
1204 { |
1190 { |
1205 iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1191 iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1206 ReadSuplUsage(); |
1192 //ReadSuplUsage(); |
1207 } |
1193 } |
1208 else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange) |
1194 else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange) |
1209 { |
1195 { |
1210 iTrace->Trace(_L("Setting Changed.Communication Parameters changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1196 iTrace->Trace(_L("Setting Changed.Communication Parameters changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1211 |
1197 |
1628 iPreviousMessageLength = 0 ; |
1614 iPreviousMessageLength = 0 ; |
1629 iIsPreviouslyDecodingFailed = EFalse; |
1615 iIsPreviouslyDecodingFailed = EFalse; |
1630 } |
1616 } |
1631 |
1617 |
1632 |
1618 |
1633 // ----------------------------------------------------------------------------- |
|
1634 // COMASUPLProtocolManager1::LaunchSettingsUI |
|
1635 // |
|
1636 // |
|
1637 // ----------------------------------------------------------------------------- |
|
1638 // |
|
1639 TInt COMASUPLProtocolManager1::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp) |
|
1640 { |
|
1641 iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSettingsUI"), KTraceFileName, __LINE__); |
|
1642 |
|
1643 if(iUIRequestArray.Count() <= 0 ) |
|
1644 { |
|
1645 iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSettingsUI"), KTraceFileName, __LINE__); |
|
1646 iUIRequestArray.Append(aObserver); |
|
1647 iSuplSettings->SetUIActive(ETrue); |
|
1648 iCurrentlyUsedHslp.Copy(aForHslp); |
|
1649 return iSettingsLauncher->LaunchSettings(); |
|
1650 } |
|
1651 else if(iCurrentlyUsedHslp.Compare(aForHslp) == KErrNone) |
|
1652 { |
|
1653 iUIRequestArray.Append(aObserver); |
|
1654 } |
|
1655 else |
|
1656 { |
|
1657 return KErrInUse; |
|
1658 } |
|
1659 |
|
1660 return KErrNone; |
|
1661 } |
|
1662 |
|
1663 // ----------------------------------------------------------------------------- |
|
1664 // COMASUPLProtocolManager1::SettingsUICompletedL |
|
1665 // |
|
1666 // |
|
1667 // ----------------------------------------------------------------------------- |
|
1668 // |
|
1669 void COMASUPLProtocolManager1::SettingsUICompletedL(TInt aError) |
|
1670 { |
|
1671 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL"), KTraceFileName, __LINE__); |
|
1672 iSuplSettings->SetUIActive(EFalse); |
|
1673 |
|
1674 if (iDeInitDone) |
|
1675 { |
|
1676 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL, de-init done. Completing request"), KTraceFileName, __LINE__); |
|
1677 iDeInitDone = EFalse; |
|
1678 User::RequestComplete(iDeInitRequestStatus,KErrNone); |
|
1679 } |
|
1680 else |
|
1681 { |
|
1682 for(TInt i = 0; i < iUIRequestArray.Count(); i++) |
|
1683 { |
|
1684 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL,Forwarding ConnRerquestor "), KTraceFileName, __LINE__); |
|
1685 MOMASuplUICompletionObserver* observer = iUIRequestArray[i]; |
|
1686 observer->SettingsUICompletedL(aError); |
|
1687 } |
|
1688 |
|
1689 } |
|
1690 |
|
1691 iCurrentlyUsedHslp.Copy(_L("")); |
|
1692 iUIRequestArray.Reset(); |
|
1693 } |
|
1694 |
|
1695 |
1619 |
1696 // ----------------------------------------------------------------------------- |
1620 // ----------------------------------------------------------------------------- |
1697 // COMASUPLProtocolManager1::DeInitialize |
1621 // COMASUPLProtocolManager1::DeInitialize |
1698 // |
1622 // |
1699 // |
1623 // |
1749 // COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI |
1673 // COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI |
1750 // |
1674 // |
1751 // |
1675 // |
1752 // ----------------------------------------------------------------------------- |
1676 // ----------------------------------------------------------------------------- |
1753 // |
1677 // |
1754 TInt COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming) |
1678 /*TInt COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming) |
1755 { |
1679 { |
1756 iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__); |
1680 iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__); |
1757 if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent) |
1681 if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent) |
1758 return KErrInUse; |
1682 return KErrInUse; |
1759 // If timeout dialog is present, close it |
1683 // If timeout dialog is present, close it |
1764 iSettingsLauncher->Cancel(); |
1688 iSettingsLauncher->Cancel(); |
1765 } |
1689 } |
1766 iSessnUIObserver = aObserver; |
1690 iSessnUIObserver = aObserver; |
1767 iSuplSettings->SetUIActive(ETrue); |
1691 iSuplSettings->SetUIActive(ETrue); |
1768 return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming); |
1692 return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming); |
1769 } |
1693 }*/ |
1770 |
1694 |
1771 // ----------------------------------------------------------------------------- |
1695 // ----------------------------------------------------------------------------- |
1772 // COMASUPLProtocolManager1::SettingsUsageUICompletedL |
1696 // COMASUPLProtocolManager1::SettingsUsageUICompletedL |
1773 // |
1697 // |
1774 // |
1698 // |
1775 // ----------------------------------------------------------------------------- |
1699 // ----------------------------------------------------------------------------- |
1776 // |
1700 // |
1777 void COMASUPLProtocolManager1::SettingsUsageUICompletedL(TInt aError) |
1701 /*void COMASUPLProtocolManager1::SettingsUsageUICompletedL(TInt aError) |
1778 { |
1702 { |
1779 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUsageUICompletedL"), KTraceFileName, __LINE__); |
1703 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUsageUICompletedL"), KTraceFileName, __LINE__); |
1780 iSuplSettings->SetUIActive(EFalse); |
1704 iSuplSettings->SetUIActive(EFalse); |
1781 |
1705 |
1782 if (iDeInitDone) |
1706 if (iDeInitDone) |
1790 if (iSessnUIObserver) |
1714 if (iSessnUIObserver) |
1791 iSessnUIObserver->SettingsUsageUICompletedL(aError); |
1715 iSessnUIObserver->SettingsUsageUICompletedL(aError); |
1792 } |
1716 } |
1793 |
1717 |
1794 CheckOutstandingUsageUIRequestsL(); |
1718 CheckOutstandingUsageUIRequestsL(); |
1795 } |
1719 }*/ |
1796 |
1720 |
1797 // ----------------------------------------------------------------------------- |
1721 // ----------------------------------------------------------------------------- |
1798 // COMASUPLProtocolManager1::ReadSuplUsage |
1722 // COMASUPLProtocolManager1::ReadSuplUsage |
1799 // Reads Supl Usage from Central Repository |
1723 // Reads Supl Usage from Central Repository |
1800 // |
1724 // |
1801 // ----------------------------------------------------------------------------- |
1725 // ----------------------------------------------------------------------------- |
1802 // |
1726 // |
1803 void COMASUPLProtocolManager1::ReadSuplUsage() |
1727 /*void COMASUPLProtocolManager1::ReadSuplUsage() |
1804 { |
1728 { |
1805 iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage start"), KTraceFileName, __LINE__); |
1729 iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage start"), KTraceFileName, __LINE__); |
1806 CSuplSettings::TSuplSettingsUsage suplUsage; |
1730 CSuplSettings::TSuplSettingsUsage suplUsage; |
1807 TInt err = iSuplStorageSettings->GetSuplUsage(suplUsage); |
1731 TInt err = iSuplStorageSettings->GetSuplUsage(suplUsage); |
1808 if(err == KErrNone ) |
1732 if(err == KErrNone ) |
1809 { |
1733 { |
1810 iSuplSettings->SetSUPLUsage(suplUsage); |
1734 iSuplSettings->SetSUPLUsage(suplUsage); |
1811 } |
1735 } |
1812 iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage end"), KTraceFileName, __LINE__); |
1736 iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage end"), KTraceFileName, __LINE__); |
1813 } |
1737 }*/ |
1814 |
1738 |
1815 void COMASUPLProtocolManager1::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId) |
1739 void COMASUPLProtocolManager1::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId) |
1816 { |
1740 { |
1817 TInt TotalSession = iSuplSessions.Count(); |
1741 TInt TotalSession = iSuplSessions.Count(); |
1818 COMASuplSession* OMAsuplSession = NULL; |
1742 COMASuplSession* OMAsuplSession = NULL; |
1939 // COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI |
1863 // COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI |
1940 // |
1864 // |
1941 // |
1865 // |
1942 // ----------------------------------------------------------------------------- |
1866 // ----------------------------------------------------------------------------- |
1943 // |
1867 // |
1944 TInt COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver ) |
1868 /*TInt COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver ) |
1945 { |
1869 { |
1946 iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchTimeOutUI"), KTraceFileName, __LINE__); |
1870 iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchTimeOutUI"), KTraceFileName, __LINE__); |
1947 |
1871 |
1948 iSessnUIObserver = aObserver; |
1872 iSessnUIObserver = aObserver; |
1949 if (iSuplSettings->IsUIActive()) |
1873 if (iSuplSettings->IsUIActive()) |
1953 } |
1877 } |
1954 |
1878 |
1955 iSuplSettings->SetUIActive(ETrue); |
1879 iSuplSettings->SetUIActive(ETrue); |
1956 iTimeOutDialogPresent = ETrue; |
1880 iTimeOutDialogPresent = ETrue; |
1957 return iSettingsLauncher->LaunchSessionTimeOutDialog(); |
1881 return iSettingsLauncher->LaunchSessionTimeOutDialog(); |
1958 } |
1882 }*/ |
1959 |
1883 |
1960 // ----------------------------------------------------------------------------- |
1884 // ----------------------------------------------------------------------------- |
1961 // COMASUPLProtocolManager1::SettingsTimeOutUICompletedL |
1885 // COMASUPLProtocolManager1::SettingsTimeOutUICompletedL |
1962 // |
1886 // |
1963 // |
1887 // |
1964 // ----------------------------------------------------------------------------- |
1888 // ----------------------------------------------------------------------------- |
1965 // |
1889 // |
1966 void COMASUPLProtocolManager1::SettingsTimeOutUICompletedL(TInt aError) |
1890 /*void COMASUPLProtocolManager1::SettingsTimeOutUICompletedL(TInt aError) |
1967 { |
1891 { |
1968 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__); |
1892 iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__); |
1969 iSuplSettings->SetUIActive(EFalse); |
1893 iSuplSettings->SetUIActive(EFalse); |
1970 iTimeOutDialogPresent = EFalse; |
1894 iTimeOutDialogPresent = EFalse; |
1971 |
1895 |
1978 else |
1902 else |
1979 { |
1903 { |
1980 if (iSessnUIObserver) |
1904 if (iSessnUIObserver) |
1981 iSessnUIObserver->SettingsTimeOutUICompletedL(aError); |
1905 iSessnUIObserver->SettingsTimeOutUICompletedL(aError); |
1982 } |
1906 } |
1983 } |
1907 }*/ |
1984 |
1908 |
1985 // ----------------------------------------------------------------------------- |
1909 // ----------------------------------------------------------------------------- |
1986 // COMASUPLProtocolManager1::GetLastUsedAccessPoint |
1910 // COMASUPLProtocolManager1::GetLastUsedAccessPoint |
1987 // |
1911 // |
1988 // ----------------------------------------------------------------------------- |
1912 // ----------------------------------------------------------------------------- |
1989 // |
1913 // |
1990 TInt COMASUPLProtocolManager1::GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId) |
1914 TInt COMASUPLProtocolManager1::GetLastUsedAccessPoint(TDes& /*aLastlyUsedAccessPoint*/,TUint32& /*iIAPId*/) |
1991 { |
1915 { |
1992 return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId); |
1916 //return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId); |
|
1917 return KErrNone; |
1993 } |
1918 } |
1994 |
1919 |
1995 // ----------------------------------------------------------------------------- |
1920 // ----------------------------------------------------------------------------- |
1996 // COMASUPLProtocolManager1::PrintHex |
1921 // COMASUPLProtocolManager1::PrintHex |
1997 // |
1922 // |
2086 iSETMode = aCommmonConfig->iSETMode; |
2011 iSETMode = aCommmonConfig->iSETMode; |
2087 iSuplUsage = aCommmonConfig->iSuplUsage; |
2012 iSuplUsage = aCommmonConfig->iSuplUsage; |
2088 iSuplInitTimeOut = aCommmonConfig->iSuplInitTimeOut; |
2013 iSuplInitTimeOut = aCommmonConfig->iSuplInitTimeOut; |
2089 iPersistFailTimer = aCommmonConfig->iPersistFailTimer; |
2014 iPersistFailTimer = aCommmonConfig->iPersistFailTimer; |
2090 } |
2015 } |
2091 |
2016 |
2092 |
2017 // ----------------------------------------------------------------------------- |
|
2018 // COMASUPLProtocolManager1::HandleSuplTriggerStatusChangeL |
|
2019 // pure virtual method from MSuplSettingsObserver; dummy implementation for compilation |
|
2020 // ----------------------------------------------------------------------------- |
|
2021 // |
|
2022 void COMASUPLProtocolManager1::HandleSuplTriggerStatusChangeL(CSuplSettings::TSuplTriggerStatus /*aSuplTriggerStatus*/ ) |
|
2023 { |
|
2024 |
|
2025 } |
|
2026 |
2093 // ----------------------------------------------------------------------------- |
2027 // ----------------------------------------------------------------------------- |
2094 // COMASUPLProtocolManager1::MakeLocationConversionRequestL |
2028 // COMASUPLProtocolManager1::MakeLocationConversionRequestL |
2095 // |
2029 // |
2096 // To make conversion request to retrieve position for a given cell id |
2030 // To make conversion request to retrieve position for a given cell id |
2097 // ----------------------------------------------------------------------------- |
2031 // ----------------------------------------------------------------------------- |
2112 |
2046 |
2113 CheckForSessionCount(); |
2047 CheckForSessionCount(); |
2114 iRunningSessionCount++; |
2048 iRunningSessionCount++; |
2115 |
2049 |
2116 COMASuplLocationId* locationId = COMASuplLocationId::NewL(); |
2050 COMASuplLocationId* locationId = COMASuplLocationId::NewL(); |
|
2051 CleanupStack::PushL(locationId); |
2117 COMASuplLocationId::TOMASuplStatus status = COMASuplLocationId::EStale; |
2052 COMASuplLocationId::TOMASuplStatus status = COMASuplLocationId::EStale; |
2118 switch(aCellInfo.iGeoCellType) |
2053 switch(aCellInfo.iGeoCellType) |
2119 { |
2054 { |
2120 case EGeoGsmCell: |
2055 case EGeoGsmCell: |
2121 { |
2056 { |
2132 cellInfo->SetSuplCellInfo(aCellInfo.iMNC,aCellInfo.iMCC,aCellInfo.iCid); |
2067 cellInfo->SetSuplCellInfo(aCellInfo.iMNC,aCellInfo.iMCC,aCellInfo.iCid); |
2133 locationId->SetSuplLocationId(cellInfo,status); |
2068 locationId->SetSuplLocationId(cellInfo,status); |
2134 } |
2069 } |
2135 break; |
2070 break; |
2136 } |
2071 } |
2137 |
2072 CleanupStack::Pop(locationId); |
2138 tempBuf.Copy(_L("MCC = ")); |
2073 tempBuf.Copy(_L("MCC = ")); |
2139 tempBuf.AppendNum(aCellInfo.iMCC); |
2074 tempBuf.AppendNum(aCellInfo.iMCC); |
2140 iTrace->Trace(tempBuf, KTraceFileName, __LINE__); |
2075 iTrace->Trace(tempBuf, KTraceFileName, __LINE__); |
2141 tempBuf.Copy(_L("MNC = ")); |
2076 tempBuf.Copy(_L("MNC = ")); |
2142 tempBuf.AppendNum(aCellInfo.iMNC); |
2077 tempBuf.AppendNum(aCellInfo.iMNC); |