diff -r 40cb640ef159 -r 086aae6fc07e bearermanagement/S60MCPR/src/s60mcpractivities.cpp --- a/bearermanagement/S60MCPR/src/s60mcpractivities.cpp Thu Jan 07 12:56:54 2010 +0200 +++ b/bearermanagement/S60MCPR/src/s60mcpractivities.cpp Mon Jan 18 20:33:49 2010 +0200 @@ -315,8 +315,8 @@ // If the migration was acepted we loop again waiting for a new, preferred one NODEACTIVITY_ENTRY( KNoTag, CS60MobilityActivity::TInformMigrationCompleted, - S60MCprMobilityActivity::TAwaitingMigrationAcceptedOrRejectedOrCancel, - S60MCprMobilityActivity::TNoTagOrErrorTagOrApplicationRejected ) //-jl- TODO cancel here? + S60MCprMobilityActivity::TAwaitingMigrationAcceptedOrRejectedOrStartupErrorIgnoredOrCancel, + S60MCprMobilityActivity::TNoTagOrErrorTagOrApplicationRejectedOrConsumeRejected ) // Informs policy server that application has accepted the carrier THROUGH_NODEACTIVITY_ENTRY( KNoTag, CS60MobilityActivity::TSendApplicationAccept, @@ -325,6 +325,12 @@ THROUGH_NODEACTIVITY_ENTRY( S60MCprStates::KApplicationRejectedMigration, CS60MobilityActivity::TSendApplicationReject, TTag ) + // Waits for Migration Rejected the carrier -msg and consumes it, because MPM doesn't need it. + // MPM already received the ProcessError which is enough. + NODEACTIVITY_ENTRY( S60MCprStates::KConsumeRejectedMsg, + CS60MobilityActivity::TClearHandshakingFlag, + S60MCprMobilityActivity::TAwaitingMigrationRejected, + TTag ) // On error, we do not terminate the activity. // We need to inform the client and propose a new handshake should the client wish to continue // Shut down the layer, to release the rejected bearer