FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/domainmgr/src/domaincli.cpp

equal deleted inserted replaced

-:2b433474f2ba
+:957c583b417b
 #include <e32property.h>
 #include <domainmember.h>
 #include <domainmanager.h>
+#include "domainmanager_private.h"
 #include "domainobserver.h"
 #include "domainsrv.h"
+#include "domainmember_private.h"
 #define __DM_PANIC(aError) User::Panic(_L("domainCli.cpp"), (-(aError)) | (__LINE__ << 16))
 #define __DM_ASSERT(aCond) __ASSERT_DEBUG(aCond,User::Panic(_L("domainCli.cpp; assertion failed"), __LINE__))
 TInt RDmDomainSession::Connect(TDmHierarchyId aHierarchyId, TDmDomainId aDomainId, TUint* aKey)
 		aDomainId);
 	return KErrNone;
 	}
-void RDmDomainSession::Acknowledge(TInt aValue, TInt aError)
+TInt RDmDomainSession::Acknowledge(TInt aValue, TInt aError)
 	{
 	__DM_ASSERT(Handle() != KNullHandle);
 	TIpcArgs a(aValue, aError);
-	TInt r = RSessionBase::SendReceive(EDmStateAcknowledge, a);
+	return RSessionBase::SendReceive(EDmStateAcknowledge, a);
-	if (r != KErrNone)
-		__DM_PANIC(r);
 	}
 void RDmDomainSession::RequestTransitionNotification()
 	{
 	__DM_ASSERT(Handle() != KNullHandle);
 			__DM_PANIC(r);
 		}
 	}
+void RDmDomainSession::DeferAcknowledgement(TRequestStatus& aStatus)
+	{
+	__DM_ASSERT(Handle() != KNullHandle);
+	RSessionBase::SendReceive(EDmStateDeferAcknowledgement, aStatus);
+	}
+void RDmDomainSession::CancelDeferral()
+	{
+	if (Handle() != KNullHandle)
+		{
+		TInt r = RSessionBase::SendReceive(EDmStateCancelDeferral);
+		if (r != KErrNone)
+			__DM_PANIC(r);
+		}
+	}
 /**
 Connects to the domain identified by the specified domain Id.
 To connect to the root domain, which has the Id KDmIdRoot,
 when the power state changes.
 @param aDomainId The identifier of the domain to be connected to.
 @return KErrNone, if successful; otherwise one of the other system-wide
-or domain manager specific error codes.
+or Domain Manager specific error codes.
 @capability WriteDeviceData If aDomainId==KDmIdRoot
 */
 EXPORT_C TInt RDmDomain::Connect(TDmDomainId aDomainId)
 	{
 @param aHierarchyId	The Id of the domain hierarchy to connect to.
 @param aDomainId    The identifier of the domain to be connected to.
 @return KErrNone, if successful; otherwise one of the other system-wide
-or domain manager specific error codes.
+or Domain Manager specific error codes.
 @capability WriteDeviceData If aDomainId==KDmIdRoot
 */
 EXPORT_C TInt RDmDomain::Connect(TDmHierarchyId aHierarchyId, TDmDomainId aDomainId)
 	{
 	iStateProperty.Cancel();
 	}
 /**
 Gets the domain's power state.
 An application normally calls this function after a notification request
 has completed. It then performs any application-dependent action demanded by
 the power state, and then acknowledges the state transition.
-Note that the domain manager requires any domain power state change to be
+Note that the Domain Manager requires any domain power state change to be
 acknowledged by all applications connected to the domain.
 @return The connected domain's power state.
 @see RDmDomain::AcknowledgeLastState()
 /**
 Acknowledges the state change.
 An application must acknowledge that it has performed all actions required
 by the last known state of the domain.
 */
 EXPORT_C void RDmDomain::AcknowledgeLastState()
 	{
-	iSession.Acknowledge(iLastStatePropertyValue, KErrNone);
+	TInt r = iSession.Acknowledge(iLastStatePropertyValue, KErrNone);
-	}
+	if (r != KErrNone && r != KErrNotFound)
+		__DM_PANIC(r);
+	}
 /**
 Acknowledges the state change with the specified error
 An application must acknowledge that it has performed all actions required
 by the last known state of the domain.
-@param aError KDmErrNotJoin if domain is not part of the hierarhcy or a
+@param aError KDmErrNotJoin if domain is not part of the hierarchy or a
 	system wide error value associated with the state change.
 */
 EXPORT_C void RDmDomain::AcknowledgeLastState(TInt aError)
 	{
-	iSession.Acknowledge(iLastStatePropertyValue, aError);
+	TInt r = iSession.Acknowledge(iLastStatePropertyValue, aError);
-	}
+	if (r != KErrNone && r != KErrNotFound)
+		__DM_PANIC(r);
+	}
+/**
+Acknowledges the state change with the specified error
+@param aError KDmErrNotJoin if domain is not part of the hierarchy or a
+	system wide error value associated with the state change.
+@return KErrNone If the acknowledgment was valid, KErrNotFound if it was spurious
+*/
+TInt RDmDomain::AcknowledgeLastStatePriv(TInt aError)
+	{
+	return iSession.Acknowledge(iLastStatePropertyValue, aError);
+	}
+/**
+Having received a state transition notification, instead of acknowledging,
+request more time. To be sure of deferring in time a client should call this immediately
+after receiving notification. This asynchronous call will complete once the original deadline
+is reached (ie. one period earlier than the final deadline), at which point the member must either
+defer again or acknowledge the transition. In the meantime, the member should perform
+its transition actions, whilst remaining responsive to new completion events.
+For example, if after receiving a transition notification, the client calls DeferAcknowledgement
+once, but fails to acknowledge or renew its deferral, it would be timed out after two time periods.
+Once the member has completed all necessary actions it should call AcknowledgeLastState
+to indicate a successful transition (it need not wait for the completion of DeferAcknowledgement).
+@note Deferrals are not always possible,
+whether the member will actually be given more time depends on if
+- The current transition allows deferrals at all.
+- The member still has deferrals left - there may be a maximum number
+allowed.
+- The deferral request was received in time.
+@param aStatus Status of request
+- KErrNone Request has completed i.e. The member must either defer again or acknowledge.
+- KErrCompletion The deferral was obsoleted by a subsequent call to AcknowledgeLastState.
+- KErrNotSupported The current transition may not be deferred, or maximum deferral count reached.
+- KErrCancel The deferral was cancelled.
+- KErrNotReady Deferral attempted before a transition notification was received
+or after the deadline for the previous one.
+- KErrPermissionDenied The member lacked the necessary capabilities.
+- KErrServerBusy A deferral was already outstanding.
+This function is provided for members to inform the Domain Manager that they
+are still active and are responding to a transition notification.
+For example, a server may have to persist data using
+the file server before shut down. Since this task should be allowed to complete
+before shutdown continues, the member should defer the transition, and then persist
+the data, using asynchronous calls.
+At least one of the below capabilities is required in order to defer a
+domain transition. Without them, the client will get KErrPermissionDenied.
+@capability WriteDeviceData
+@capability ProtServ
+@pre The member has been notified of a transition which it has not yet acknowledged
+*/
+EXPORT_C void RDmDomain::DeferAcknowledgement(TRequestStatus& aStatus)
+	{
+	iSession.DeferAcknowledgement(aStatus);
+	}
+/**
+Will cancel a call of DeferAcknowledgement(), if one was pending.
+If none was pending, it does nothing.
+*/
+EXPORT_C void RDmDomain::CancelDeferral()
+	{
+	iSession.CancelDeferral();
+	}
 /**
 Gets the domain's state.
 An application normally calls this function after a notification request
 has completed. It then performs any application-dependent action demanded by
 the state, and then acknowledges the state transition.
-Note, that the domain manager requires any domain state change to be
+Note, that the Domain Manager requires any domain state change to be
 acknowledged by all applications connected to the domain.
 @return The connected domain's state.
 */
 EXPORT_C TDmDomainState RDmDomain::GetState()
 	{
 	__DM_ASSERT(Handle() != KNullHandle);
 	return(RSessionBase::SendReceive(EDmObserveredCount));
 	}
-/**
-@internalAll
-@released
+//-- RDmDomainManager ---------------------------------------------------------
+/**
+Caller blocked until the Domain Manager server has started up and is ready
+for requests.
+@return	KErrNone once the Domain Manager server is ready, otherwise one of the
+		other system wide or the Domain Manager specific error codes.
 */
 EXPORT_C TInt RDmDomainManager::WaitForInitialization()
 	{
 	RProperty prop;
 	TInt r = prop.Attach(KUidDmPropertyCategory, KDmPropertyKeyInit);
 		TInt value;
 		r = prop.Get(value);
 		if (r == KErrNone)
 			{
 			if (value) break; // initialized
-			// property exists but the server is not intialized yet
+			// property exists but the server is not initialised yet
 			}
 		else
 			{
 			if (r != KErrNotFound) break; // error
 			// property doesn't exist yet
 	return r;
 	}
 /**
 Opens a controlling connection to the standard power domain hierarchy
-in the domain manager.
+in the Domain Manager.
-The domain manger allows only one open connection at any one time to the
+The Domain Manager allows only one open connection at any one time to the
 power domain hierarchy.
-Connection is usually made by the power policy entity.
+@return KErrNone if successful, otherwise one of the other system-wide
-@return KErrNone, if successful; otherwise one of the other system-wide
+or the Domain Manager specific error codes.
-or the domain manager specific error codes.
+@return KErrInUse when the power hierarchy already has a controller connected.
+@return KErrBadHierarchyId when the server has failed to load the power hierarchy.
-@see KDmErrAlreadyJoin
+@return KErrPermissionDenied when the client has insufficient capabilities
+@capability PowerMgmt Required to create a connection to the Domain Manager.
+@see KDmHierarchyIdPower
 */
 EXPORT_C TInt RDmDomainManager::Connect()
 	{
 	return iSession.Connect(KDmHierarchyIdPower);
 	}
+/**
+Opens a controlling connection to a specific domain hierarchy previously
-/**
+loaded into the Domain Manager by the controller. The Domain Manager allows only
-Opens a controlling connection to a specific domain hieararchy owned
+one open connection at any one time to a particular hierarchy.
-by the domain manager.
+@param	aHierarchyId The Id of the domain hierarchy to connect to.
-The domain manger allows only one open connection at any one time to a
-particular hierarchy.
+@return KErrNone if successful, otherwise one of the other system-wide
+or the Domain Manager specific error codes.
-@param	aHierarchyId	The Id of the domain hierarchy to connect to.
+@return KErrInUse when the power hierarchy already has a controller connected.
+@return KErrBadHierarchyId when the server has failed to load the power hierarchy.
-@return KErrNone, if successful; otherwise one of the other system-wide
+@return KErrPermissionDenied when the client has insufficient capabilities
-or domain manager specific error codes.
+@capability PowerMgmt Required to create a connection to the Domain Manager.
-@see KDmErrAlreadyJoin
-@see KErrBadHierarchyId
 */
 EXPORT_C TInt RDmDomainManager::Connect(TDmHierarchyId aHierarchyId)
 	{
 	return iSession.Connect(aHierarchyId);
 	}
+/**
+Closes this connection to the Domain Manager.
-/**
-Closes this connection to the domain manager.
 If there is no existing connection, then it returns silently.
 */
 EXPORT_C void RDmDomainManager::Close()
 	{
 	iSession.Close();
 	}
+/**
+Requests a system-wide power state transition and is used with the
-/**
+KDmHierarchyIdPower hierarchy. The domain hierarchy is traversed in the
-Requests a system-wide power state transition.
+default direction.
-The domain hierarchy is traversed in the default direction
+A transition to the power state EPwActive is an error and result in
+async completion with KErrArgument.
-@param aState   The target power state.
-@param aStatus  The request status object for this asynchronous request.
+@param aState   The target power state, not EPwActive or >=EPwLimit.
+@param aStatus	The request status object for this asynchronous request.
 @see RDmDomainManager::CancelTransition()
+@see KDmHierarchyIdPower
 */
 EXPORT_C void RDmDomainManager::RequestSystemTransition(TPowerState aState, TRequestStatus& aStatus)
 	{
-	if (aState == EPwActive)
+	if ((aState == EPwActive) || (aState >= EPwLimit))
 		{
 		TRequestStatus* status = &aStatus;
 		User::RequestComplete(status, KErrArgument);
 		return;
 		}
 	RequestSystemTransition((TDmDomainState) aState, ETraverseDefault, aStatus);
 	}
+/**
+Requests a system-wide power off (EPwOff) state transition to shutdown the
-/**
+platform. Applicable to the KDmHierarchyIdPower hierarchy.
-Requests a system-wide power shutdown.
+This call does not return; the system can only return by physical button restart.
-This is a request to change the system's power state to EPwOff.
-This call does not return; the system can only return by rebooting.
+@see KDmHierarchyIdPower
 */
 EXPORT_C void RDmDomainManager::SystemShutdown()
 	{
 	TRequestStatus status;
 	RequestSystemTransition((TDmDomainState) EPwOff, ETraverseDefault, status);
 	User::WaitForRequest(status);
 	__DM_ASSERT(0);
 	}
+/**
+Requests a domain power state transition and is used with the
-/**
+KDmHierarchyIdPower hierarchy. The domain hierarchy is traversed in the
-Requests a domain state transition.
+default direction.
-The domain hierarchy is traversed in the default direction.
 @param aDomainId The Id of the domain for which the state transition
 is being requested.
-@param aState    The target state.
+@param aState    The target power state.
-@param aStatus   The request status object for this asynchronous request.
+@param aStatus   The request status object to receive the asynchronous result.
+				 KErrNone if successful, otherwise one of the other system-wide
+		 or the Domain Manager specific error codes.
+@see KDmHierarchyIdPower
 @see RDmDomainManager::CancelTransition()
 */
 EXPORT_C void RDmDomainManager::RequestDomainTransition(
 	TDmDomainId aDomainId,
 	TPowerState aState,
 	{
 	RequestDomainTransition(aDomainId,(TDmDomainState)  aState, ETraverseDefault, aStatus);
 	}
+/**
+Cancels an outstanding state transition, whether initiated by a call
-/**
-Cancels a state transition, whether initiated by a call
 to RequestSystemTransition() or RequestDomainTransition().
-An outstanding state transition request completes with KErrCancel.
+The outstanding state transition request completes with KErrCancel.
 */
 EXPORT_C void RDmDomainManager::CancelTransition()
 	{
 	iSession.CancelTransition();
 	}
+/**
+Requests a state transition across the whole domain hierarchy that
-/**
+this connection is controlling. The domain hierarchy is traversed in the
-Requests a system-wide state transition.
+specified direction.
-The domain hierarchy is traversed in the specified direction.
-@param aState   The target state.
+@param aState	The target state, hierarchy specific state value.
 @param aDirection The direction in which to traverse the hierarchy
-@param aStatus  The request status object for this asynchronous request.
+@param aStatus  The request status object to receive the asynchronous result.
+				KErrNone if successful, otherwise one of the other system-wide
+		or the Domain Manager specific error codes.
+@panic domainCli.cpp; assertion failed line - if the numerical value of
+		aDirection is greater than the value of ETraverseMax.
 @see RDmDomainManager::CancelTransition()
-@panic domainCli.cpp; assertion failed VARNUM if the numerical value of aDirection
-is greater than the value of ETraverseMax. NOTE: VARNUM is the line number
-in the source code and may change if the implementation changes.
 */
 EXPORT_C void RDmDomainManager::RequestSystemTransition(
 	TDmDomainState aState,
 	TDmTraverseDirection aDirection,
 	TRequestStatus& aStatus)
 	iSession.RequestSystemTransition(aState, aDirection, aStatus);
 	}
+/**
-/**
+Requests a domain state transition for the hierarchy that this connection is
-Requests a domain state transition.
+controlling. The domain hierarchy is traversed in the specified direction.
-The domain hierarchy is traversed in the specified direction
 @param aDomainId The Id of the domain for which the state transition
 is being requested.
 @param aState    The target state.
 @param aDirection The direction in which to traverse the hierarchy.
-@param aStatus   The request status object for this asynchronous request.
+@param aStatus   The request status object to receive the asynchronous result.
+				 KErrNone if successful, otherwise one of the other system-wide
-@see RDmDomainManager::CancelTransition()
+		 or the Domain Manager specific error codes.
 @panic domainCli.cpp; assertion failed VARNUM if the numerical value of aDirection
 is greater than the value of ETraverseMax. NOTE: VARNUM is the line number
 in the source code and may change if the implementation changes.
+@see RDmDomainManager::CancelTransition()
 */
 EXPORT_C void RDmDomainManager::RequestDomainTransition(
 	TDmDomainId aDomainId,
 	TDmDomainState aState,
 	TDmTraverseDirection aDirection,
 	iSession.RequestDomainTransition(aDomainId, aState, aDirection, aStatus);
 	}
+/**
-/**
+Instructs the Domain Manager to load the domain hierarchy library for
-Adds a domain hierarchy to the domain manager.
+aHierarchyId. The library takes the name "domainpolicyNN.dll" where NN is
+the hierarchy number as supplied.
 @param aHierarchyId The Id of the domain hierarchy to be added.
-@return	KErrNone if successful; otherwise one of the other system-wide
+@return KErrNone if successful, otherwise one of the other system-wide
-or domain manager specific error codes.
+or the Domain Manager specific error codes.
+@return KErrBadHierarchyId If the library is not found or contains invalid data
+@return KErrPermissionDenied when the client has insufficient capabilities
+@capability PowerMgmt Required to create a connection to the Domain Manager.
 */
 EXPORT_C TInt RDmDomainManager::AddDomainHierarchy(TDmHierarchyId aHierarchyId)
 	{
 	RDmManagerSession	session;
 	TInt r = session.Connect();
 	session.Close();
 	return r;
 	}
 /**
 Requests a list of transition failures since the last transition request.
-@param aTransitionFailures A client-supplied array of TTransitionFailure objects which
+@param aTransitionFailures A client supplied array of TTransitionFailure objects
-		on exit will contain the failures that have occurred since the last transition
+		which on exit will contain the failures that have occurred since the
-		request.
+		last transition	request.
-@pre	The session must be connected.
+@return KErrNone if successful, otherwise one of the other system-wide
-@return KErrNone, if successful; otherwise one of the other system-wide
+or the Domain Manager specific error codes.
-or domain manager specific error codes.
 */
 EXPORT_C TInt RDmDomainManager::GetTransitionFailures(RArray<const TTransitionFailure>& aTransitionFailures)
 	{
 	return iSession.GetTransitionFailures(aTransitionFailures);
 	}
 /**
 Gets the number of transition failures since the last transition request.
-@return	The number of failures, if successful; otherwise one of the other system-wide
+@return KErrNone if successful, otherwise one of the other system-wide
-or domain manager specific error codes.
+or the Domain Manager specific error codes.
 */
 EXPORT_C TInt RDmDomainManager::GetTransitionFailureCount()
 	{
 	return iSession.GetTransitionFailureCount();
 	}
-// CDmDomain
+//-- CDmDomain ----------------------------------------------------------------
 /**
 Constructor.
 Adds this active object to the active scheduler. The priority of the active object
 /**
 Destructor.
-Closes the session to the domain manager.
+Closes the session to the Domain Manager.
 */
 EXPORT_C CDmDomain::~CDmDomain()
 	{
 	Cancel();
 	iDomain.Close();
 /**
 Requests notification when the domain's state changes.
 RunL() will be called when this happens.
+@note
+If the client is ready to acknowledge the last transition, but
+would like to register for notification of the next one, it
+should call this function and then call AcknowledgeLastState,
+immediately afterwards.
+This eliminates the possibility of a transition occurring
+between acknowledging and registering for notification.
 */
 EXPORT_C void CDmDomain::RequestTransitionNotification()
 	{
 	__DM_ASSERT(!IsActive());
 	iDomain.RequestTransitionNotification(iStatus);
 Acknowledges the last state change.
 An application must acknowledge that it has performed all actions required
 by the last known state of the domain.
-@param aError	The error to return to the domain manager. The client should
+@param aError	The error to return to the Domain Manager. The client should
 				set this to KErrNone if it successfully transitioned to the
 				new state or to one of the system-wide error codes.
 */
 EXPORT_C void CDmDomain::AcknowledgeLastState(TInt aError)
 	{
 EXPORT_C TDmDomainState CDmDomain::GetState()
 	{
 	return iDomain.GetState();
 	}
+//-- CDmDomainKeepAlive ----------------------------------------------------------------
+/**
+Constructor.
+Adds this active object to the active scheduler.
+@param aHierarchyId The Id of the domain hierarchy to connect to.
+@param aDomainId	The Id of the domain to connect to.
+@see CActive
+*/
+EXPORT_C CDmDomainKeepAlive::CDmDomainKeepAlive(TDmHierarchyId aHierarchyId, TDmDomainId aDomainId)
+	: CDmDomain(aHierarchyId, aDomainId), iKeepAlive(NULL)
+	{
+	}
+/**
+Destructor.
+Cleanup the internal CDmKeepAlive active object.
+*/
+EXPORT_C CDmDomainKeepAlive::~CDmDomainKeepAlive()
+	{
+	delete iKeepAlive;
+	}
+/**
+Complete construction of this object. Classes derived from this one
+should call this as part of their ConstructL or NewL functions.
+*/
+EXPORT_C void CDmDomainKeepAlive::ConstructL()
+	{
+	CDmDomain::ConstructL();
+	iKeepAlive = new (ELeave) CDmKeepAlive(iDomain, *this);
+	}
+/**
+Acknowledges the last state change.
+An application must acknowledge that it has performed all actions required
+by the last known state of the domain.
+Once this is done the AO will no longer attempt to defer deadlines.
+@param aError	The error to return to the Domain Manager. The client should
+				set this to KErrNone if it successfully transitioned to the
+				new state or to one of the system-wide error codes.
+*/
+EXPORT_C void CDmDomainKeepAlive::AcknowledgeLastState(TInt aError)
+	{
+	TInt r = iDomain.AcknowledgeLastStatePriv(aError);
+	if (r != KErrNone && r != KErrNotFound)
+		__DM_PANIC(r);
+	if (r == KErrNone)
+		{
+		// KErrNone indicates that an acknowledgment was accepted
+		// (as opposed to being spurious or late)
+		iKeepAlive->NotifyOfAcknowledgment();
+		}
+	}
+/**
+Handle completion of request notifications, begins deferrals.
+@note Clients should not need to override this, they
+will be notified of events via calls to HandleTransitionL.
+*/
+EXPORT_C void CDmDomainKeepAlive::RunL()
+	{
+	iKeepAlive->DeferNotification();
+	HandleTransitionL();
+	}
+/**
+This object will internally, use RDmDomain::DeferAcknowledgement.
+The default implementation of this function will simply ignore errors
+from RDmDomain::DeferAcknowledgement that
+it presumes the client can not or need not handle.
+ie.
+KErrCompletion - Client has now acknowledged notification - not an error.
+KErrCancel - Server cancelled request - client can do nothing.
+KErrNotSupported - Deferral not possible - client can do nothing.
+KErrNotReady - Deferral too late or too early - client can do nothing.
+All other error codes will be returned unhandled to the active scheduler,
+leading to a panic.
+If the client does want to handle or inspect these errors e.g. for diagnostic
+purposes, they can override this method. KErrNone should be returned
+for errors that should not be passed to the active scheduler.
+@param aError Error code to handle
+*/
+EXPORT_C TInt CDmDomainKeepAlive::HandleDeferralError(TInt aError)
+	{
+	switch (aError)
+		{
+		case KErrCompletion:
+		case KErrCancel:
+		case KErrNotSupported:
+		case KErrNotReady:
+			{
+			// All the above error codes may occur but signal only
+			// that Deferrals should not continue for the current
+			// transition.
+			return KErrNone;
+			}
+		case KErrPermissionDenied:
+		case KErrServerBusy:
+		default:
+			{
+			return aError;
+			}
+		}
+	}
+//-- CDmKeepAlive ----------------------------------------------------------------
+CDmKeepAlive::CDmKeepAlive(RDmDomain& aDomain, CDmDomainKeepAlive& aOwnerActiveObject)
+	: CActive(CActive::EPriorityHigh), iDomain(aDomain), iOwnerActiveObject(aOwnerActiveObject), iCeaseDeferral(EFalse)
+	{
+	CActiveScheduler::Add(this);
+	}
+CDmKeepAlive::~CDmKeepAlive()
+	{
+	Cancel();
+	}
+void CDmKeepAlive::DeferNotification()
+	{
+	__DM_ASSERT(!IsActive());
+	iStatus = KRequestPending;
+	iDomain.DeferAcknowledgement(iStatus);
+	SetActive();
+	}
+/**
+Informs the object that the state transition has
+been _successfully_ acknowledged
+*/
+void CDmKeepAlive::NotifyOfAcknowledgment()
+	{
+	if (IsActive())
+		{
+		iCeaseDeferral = ETrue;
+		}
+	}
+void CDmKeepAlive::RunL()
+	{
+	const TInt error = iStatus.Int();
+	TBool ceaseDeferral = iCeaseDeferral;
+	iCeaseDeferral = EFalse;
+	User::LeaveIfError(error);
+	// If a valid acknowledgment
+	// has occured since the last deferral
+	// then avoid deferring again since
+	// this would only lead to KErrNotReady
+	if(!ceaseDeferral)
+		{
+		DeferNotification();
+		}
+	else
+		{
+		// At this point we know error == KErrNone
+		// However, we return the error code KErrCompletion, as this
+		// is what would have happened, had the acknowledgment come in
+		// a little earlier,
+		// whilst the deferral was still outstanding on the server.
+		User::Leave(KErrCompletion);
+		}
+	}
+TInt CDmKeepAlive::RunError(TInt aError)
+	{
+	return iOwnerActiveObject.HandleDeferralError(aError);
+	}
+void CDmKeepAlive::DoCancel()
+	{
+	iDomain.CancelDeferral();
+	}
 // CDmDomainManager
 /**
 Constructor.
 /**
 Destructor.
-Closes the session to the domain manager.
+Closes the session to the Domain Manager.
 */
 EXPORT_C CDmDomainManager::~CDmDomainManager()
 	{
 	Cancel();
 	iManager.Close();
 /**
-Adds a domain hierarchy to the domain manager.
+Adds a domain hierarchy to the Domain Manager.
 @param aHierarchyId The Id of the domain hierarchy to add
 @return	KErrNone if successful; otherwise one of the other system-wide
-or domain manager specific error codes.
+or Domain Manager specific error codes.
 */
 EXPORT_C TInt CDmDomainManager::AddDomainHierarchy(TDmHierarchyId aHierarchyId)
 	{
 	RDmManagerSession	session;
 	TInt r = session.Connect();
 		on exit will contain the failures that have occurred since the last transition
 		request.
 @pre	The session must be connected.
 @return KErrNone, if successful; otherwise one of the other system-wide
-or domain manager specific error codes.
+or Domain Manager specific error codes.
 */
 EXPORT_C TInt CDmDomainManager::GetTransitionFailures(RArray<const TTransitionFailure>& aTransitionFailures)
 	{
 	return iManager.GetTransitionFailures(aTransitionFailures);
 	}
 /**
 Gets the number of transition failures since the last transition request.
 @return	The number of failures if successful, otherwise one of the other system-wide
-or domain manager specific error codes.
+or Domain Manager specific error codes.
 */
 EXPORT_C TInt CDmDomainManager::GetTransitionFailureCount()
 	{
 	return iManager.GetTransitionFailureCount();
 	}
 /**
 Constructs a new observer on the domain hierarchy.
 Note that only one observer per domain hierarchy is allowed.
-@param	aHierarchyObserver	The implementation of the interface to the domain manager.
+@param	aHierarchyObserver	The implementation of the interface to the Domain Manager.
 @param	aHierarchyId		The Id of the domain hierarchy.
 @return The newly created CHierarchyObserver object.
 */
 EXPORT_C CHierarchyObserver* CHierarchyObserver::NewL(MHierarchyObserver& aHierarchyObserver,TDmHierarchyId aHierarchyId)

changeset 279	957c583b417b
parent 243	c7a0ce20c48c