--- a/locationrequestmgmt/locationserver/src/EPos_CPosServer.cpp Wed Sep 15 00:02:22 2010 +0300
+++ b/locationrequestmgmt/locationserver/src/EPos_CPosServer.cpp Wed Oct 13 16:07:50 2010 +0300
@@ -134,56 +134,17 @@
*/
void CPosServer::ConstructL()
{
-#if defined __WINSCW__ && defined SYMBIAN_CELLMO_CENTRIC
- TBool LocationManagementSupported = EFalse;
-#else
+ TBool LocationManagementSupported = EFalse;
#ifdef SYMBIAN_FEATURE_MANAGER
- TBool LocationManagementSupported = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KLocationManagement);
+ LocationManagementSupported = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KLocationManagement);
#else
__ASSERT_ALWAYS(EFalse, User::Invariant()); // Would happen on older versions of symbian OS if this code ever backported
-#endif // SYMBIAN_FEATURE_MANAGER
-#endif // __WINSCW__ && defined SYMBIAN_CELLMO_CENTRIC
-
-
-#if defined __WINSCW__
- if(LocationManagementSupported && !FindRootProcess())
- {
- _LIT(KLbsRootFileName, "\\sys\\bin\\lbsroot.exe");
- _LIT(KLbsRootProcessName, "lbsroot.exe");
- _LIT(KLbsCommandLine, "");
- RProcess process;
- TInt r=process.Create(KLbsRootProcessName,KLbsCommandLine);
- if (r!=KErrNone)
- {
- User::Leave(r);
- }
- TRequestStatus stat;
- process.Rendezvous(stat);
- if (stat!=KRequestPending)
- {
- process.Kill(0);
- }
- else
- {
- process.Resume();
- }
- User::WaitForRequest(stat);
- r=(process.ExitType()==EExitPanic) ? KErrGeneral : stat.Int();
-
- process.Close();
- if (r!=KErrNone)
- {
- User::Leave(r);
- }
- }
-#endif // WINSCW
-
+#endif
// make sure that root process is running
if(LocationManagementSupported && !FindRootProcess())
{
User::Leave(KErrNotReady);
}
-
// Backup listener
DEBUG_TRACE("Checking for backup or restore...", __LINE__)
iBackupListener = CPosBackupListener::NewL();