--- a/locationrequestmgmt/networkrequesthandler/inc/privacyandlocationrequesthandler.h Tue Jul 13 12:25:28 2010 +0100
+++ b/locationrequestmgmt/networkrequesthandler/inc/privacyandlocationrequesthandler.h Wed Sep 08 15:16:57 2010 +0100
@@ -121,6 +121,8 @@
TPositionModuleInfoExtended::TDeviceGpsModeCapabilities DeviceGpsModeCaps();
CLbsAdmin::TLbsBehaviourMode BehaviourMode();
RLbsNetworkRegistrationStatus& NetworkRegistrationStatus();
+ void IncrementPositioningStatus();
+ void DecrementPositioningStatus();
private:
static TBool IsSessionIdEqual(
@@ -162,6 +164,12 @@
CLbsPrivLocFsm* iMolRFsm;
CLbsPrivLocFsm* iX3pFsm;
+
+ // ETrue if location management is supported
+ TBool iLocationManagementSupported;
+
+ // Category of the Positioning Status P&S Keys
+ TUid iPosStatusCategory;
};
@@ -437,7 +445,7 @@
RLbsNetworkRegistrationStatus& LbsNetworkRegistrationStatus();
TPositionModuleInfoExtended::TDeviceGpsModeCapabilities DeviceGpsModeCaps();
CLbsAdmin::TLbsBehaviourMode BehaviourMode();
-
+ void IncrementPositioningStatus();
protected:
CLbsPrivLocFsm* iFsm;
@@ -776,9 +784,16 @@
TLbsNetSessionIdInt& LastLocReqSessionId()
{ return iLastLocReqSessionId; }
- TBool& WasPrivacyResponseReceivedStateExited()
+ TBool& WasPrivacyResponseReceivedStateExited()
{ return iWasPrivacyResponseReceivedStateExited; }
+ TLbsExternalRequestInfo::TRequestType& ExternalRequestType()
+ { return iExternalRequestType; }
+
+ TBool& WasPositioningStatusIncremented()
+ { return iPositioningStatusIncremented; }
+
+
private: // Allow access for friend classes (the states and the NRH)
friend class CLbsPrivLocStateBase;
friend class CLbsNetworkRequestHandler;
@@ -860,6 +875,12 @@
// Has a privacy request been rejected?
TBool iWasPrivacyResponseReceivedStateExited;
+ // The type of external request that has been recieved.
+ TLbsExternalRequestInfo::TRequestType iExternalRequestType;
+
+ // Indicates if this session resulted in the positioning status being incremented.
+ TBool iPositioningStatusIncremented;
+
private:
// the states
CLbsPrivLocStateBase* iCurrentState;