FCL/sf/os/lbs: comparison locationrequestmgmt/locationserver/src/EPos

equal deleted inserted replaced

-:95c570bf4a05
+:9a7e3d5f461a
 #include <e32base.h>
 #include <lbspositioninfo.h>
 #include <lbs/epos_cpositioner.h>
 #include <lbs/epos_cposmodules.h>
 #include <lbs/epos_mposmodulesobserver.h>
+#include <centralrepository.h>
 #include "lbsdevloggermacros.h"
 #include "EPos_ServerPanic.h"
 #include "EPos_Global.h"
 #include "EPos_CPosCallbackTimer.h"
 #include "EPos_CPositionRequest.h"
 #include "epos_cposmodulessettings.h"
 //TODO Verify
 #include "EPos_CPosLocMonitorReqHandlerHub.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "EPos_CPositionRequestTraces.h"
 #endif
+#include "lbsrootcenrepdefs.h"
+#include "lbspositioningstatusprops.h"
 // CONSTANTS
 #ifdef _DEBUG
 _LIT(KTraceFileName, "EPos_CPositionRequest.cpp");
 #endif
 const TInt KParamPositionInfo = 0;
+const TTimeIntervalMicroSeconds KIndFlickerTresholdTracking = 30000000;
 // ================= LOCAL FUNCTIONS ========================
 void CancelTimerCleanup(TAny* aTimer)
 {
 CActive(EPriorityStandard),
 iRequestPhase(EPosReqInactive),
 iPositionerParams(aPositionerParams),
 iHasProxyPositioner(aIsProxy),
 iLocMonitorReqHandler(aLocMonitorReqHandlerHub),
-iModuleSettings(aModuleSettings)
+iModuleSettings(aModuleSettings),
+iPositioningActive( EFalse )
 {
 CActiveScheduler::Add(this);
 }
 // EPOC default constructor can leave.
 if (!iModuleInfo.IsAvailable())
 {
 User::Leave(KErrNotFound);
 }
+// Get the CategoryUid from the cenrep file owned by LbsRoot.
+CRepository* rep = CRepository::NewLC(KLbsCenRepUid);
+TInt posStatusCategory;
+TInt err = rep->Get(KMoPositioningStatusAPIKey, posStatusCategory);
+User::LeaveIfError(err);
+CleanupStack::PopAndDestroy(rep);
+iPosStatusCategory = TUid::Uid(posStatusCategory);
 LoadPositionerL();
 }
 /**
 * Two-phased constructor.
 }
 delete iTrackingTimer;
 delete iPositionBuffer;
 delete iTimeoutTimer;
 delete iPositioner;
+// Deactivate the positioning status when the object dies.
+DeActivatePositioningStatusIfNeeded();
 }
 /**
 * Starts a position request cycle. Should only be called when PSY is
 * enabled.
 */
 void CPositionRequest::MakeRequestL(const RMessage2& aMessage)
 {
 if (!iModuleInfo.IsAvailable())
 {
+// Deactivate positioning status if there are PSY's not found.
+DeActivatePositioningStatusIfNeeded();
 User::Leave(KErrNotFound);
 }
 __ASSERT_DEBUG(iPositioner, DebugPanic(EPosServerPanicPositionerNotInitialized));
 iMessage = aMessage; // Store parameter here in case of leave.
 // Clear previous position data
 delete iPositionBuffer;
 iPositionBuffer = NULL;
 !(classType & EPositionInfoClass))
 {
 User::Leave(KErrArgument);
 }
 // Set ModuleId to KNullId to be able to verify that Id is set by PSY.
 infoBase.SetModuleId(KNullUid);
 CleanupStack::PushL(TCleanupItem(CancelTimerCleanup, iTimeoutTimer));
+		ActivatePositioningStatusIfNeeded();
 // Start timer if necessary
 if (iTimeOut.Int64() > 0)
 {
 LBS_RDEBUG_INFO("CPositionRequest::MakeRequestL() Start Timeout Timer");
 {
 if (aEvent.iModuleId != iModuleInfo.ModuleId())
 {
 return;
 }
 switch (aEvent.iType)
 {
 case EPosModulesEventAvailabilityChanged:
 case EPosModulesEventModuleInstalled:
 iModuleSettings.PosModules().GetModuleInfoL(
 iModuleInfo.SetIsAvailable(EFalse);
 break;
 default:
 return;
 }
+		if (!iModuleInfo.IsAvailable())
-if (!iModuleInfo.IsAvailable())
+{
-{
+// Deactivate positioning status if there are PSY's not found.
+DeActivatePositioningStatusIfNeeded();
 if (IsActive())
 {
 CompleteClient(KErrNotFound);
 Cancel();
 }
 default:
 	DEBUG_TRACE("CPositionRequest::DoCancel() panicing", __LINE__)
 DebugPanic(EPosServerPanicRequestInconsistency);
 }
+// Deactive positioning status after cancellation.
+DeActivatePositioningStatusIfNeeded();
 TInt err;
 if (iRequestTimedOut)
 {
 iRequestTimedOut = EFalse;
 StopTracking();
 }
 }
 iRequestPhase = EPosReqInactive;
 OstTraceFunctionExit1( CPOSITIONREQUEST_DOCANCEL_EXIT, this );
 }
 void CPositionRequest::CompleteSelf(TInt aReason)
 }
 }
 else
 {
 CompleteClient(aReason);
+}
+// If the request is not tracking mode, deactivate the indicator
+// Tracking mode check and the last check for the error scenarios other than
+// KErrNone and KPositionPartialUpdate.
+if( ( ( iTrackingState == EPosFirstTrackingRequest || iTrackingState == EPosTracking ) &&
+	     iTrackingUpdateInterval >  KIndFlickerTresholdTracking ) ||
+iTrackingUpdateInterval == TTimeIntervalMicroSeconds ( 0 ) ||
+!( aReason == KErrNone || aReason == KPositionPartialUpdate ) )
+{
+DeActivatePositioningStatusIfNeeded();
 }
 }
 void CPositionRequest::StartPositionDataRequestPhase()
 {
 	{
 	LBS_RDEBUG_INFO("CPositionRequest::ExtendUpdateTimeOut()");
 	iTimeoutTimer->ExtendTimeout(aAdditionalTime);
 	}
+void CPositionRequest::ActivatePositioningStatusIfNeeded()
+{
+// Check for the positioning status, If it has been activated from this object,
+// there is no need to increment the count again.
+if( !iPositioningActive )
+{
+TInt count, err;
+err = RProperty::Get(iPosStatusCategory, KLbsMoPositioningStatusKey, count);
+if(err == KErrNone)
+{
+err = RProperty::Set(iPosStatusCategory, KLbsMoPositioningStatusKey, count+1);
+if(err == KErrNone)
+{
+iPositioningActive = ETrue;
+}
+else
+{
+DEBUG_TRACE("CPositionRequest::ActivatePositioningStatusIfNeeded() - Error in  setting Positioning Status", __LINE__)
+}
+}
+else
+{
+DEBUG_TRACE("CPositionRequest::ActivatePositioningStatusIfNeeded() - Error in  getting Positioning Status", __LINE__)
+}
+}
+}
+void CPositionRequest::DeActivatePositioningStatusIfNeeded()
+{
+// If the positioning status is activated by this object, deactivate it
+if( iPositioningActive )
+{
+TInt  count, err;
+err = RProperty::Get(iPosStatusCategory, KLbsMoPositioningStatusKey, count);
+if(err == KErrNone)
+	{
+__ASSERT_DEBUG(count > 0, DebugPanic(EPosServerPanicIndDeactivationFailed));
+err = RProperty::Set(iPosStatusCategory, KLbsMoPositioningStatusKey, count-1);
+if(err == KErrNone)
+{
+iPositioningActive = EFalse;
+}
+else
+{
+DEBUG_TRACE("CPositionRequest::DeActivatePositioningStatusIfNeeded() - error in setting Positioning Status", __LINE__)
+}
+	}
+else
+	{
+	DEBUG_TRACE("CPositionRequest::DeActivatePositioningStatusIfNeeded() - error in getting Positioning Status", __LINE__)
+	}
+}
+}
 //  End of File

changeset 60	9a7e3d5f461a
parent 51	95c570bf4a05