--- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp	Tue May 11 16:43:51 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp	Tue May 25 13:18:28 2010 +0300
@@ -53,7 +53,7 @@
 
 #include <NcnListInternalPSKeys.h>
 #include <centralrepository.h>
-#include <telinternalcrkeys.h>
+#include <telservicesinternalcrkeys.h>
 #include <coreapplicationuisdomainpskeys.h>
 
 
@@ -1976,10 +1976,10 @@
         {
         CRepository* cenRepSession = NULL;
         TRAP ( err ,
-               cenRepSession = CRepository::NewL( KCRUidTelVariation ) );
+               cenRepSession = CRepository::NewL( KCRUidTelSrvVariation ) );
         if ( err == KErrNone )
             {
-            err = cenRepSession->Get( KTelVariationFlags,
+            err = cenRepSession->Get( KTelSrvVariationFlags,
                                    iVariantReadOnlyValues );
             }
         delete cenRepSession;

--- a/satengine/SatServer/Commands/PlayToneCmd/src/CPlayToneHandler.cpp	Tue May 11 16:43:51 2010 +0300
+++ b/satengine/SatServer/Commands/PlayToneCmd/src/CPlayToneHandler.cpp	Tue May 25 13:18:28 2010 +0300
@@ -69,14 +69,16 @@
     LOG( SIMPLE, "PLAYTONE: CPlayToneHandler::ClientResponse calling" )
 
     iPlayToneRsp.SetPCmdNumber( iPlayToneData.PCmdNumber() );
-    if ( RSat::KPSessionTerminatedByUser == iPlayToneRsp.iGeneralResult )
-        {
-        LOG( SIMPLE, "PLAYTONE: CPlayToneHandler::ClientResponse \
-             KPSessionTerminatedByUser" )
-        // Next SimSession end will close the ui session.
-        iUtils->NotifyEvent( MSatUtils::ESessionTerminatedByUser );
-        }
-        
+    
+    // A short-ish Play tone is aborted in GCf testing, that will be supported
+    // by using the Sat app Menu key to abort the play tone and to respond
+    // with KPSessionTerminatedByUser to Sat Server. That's why 
+    // MSatUtils::ESessionTerminatedByUser notify is NOT sent here because
+    // otherwise CSimSessionEndHandler::HandleCommand() closes Sat App always.
+    // (That should be done only if UI was not launched by user.)
+    LOG2( SIMPLE, "PLAYTONE: CPlayToneHandler::ClientResponse result=%d",
+        iPlayToneRsp.iGeneralResult )
+    
     // If command had icon data and was done succesfully, report that icon
     // was not shown
     // To be removed when icons are allowed in this command

--- a/satui/satapp/SATUISrc/CSatUiViewAppUi.cpp	Tue May 11 16:43:51 2010 +0300
+++ b/satui/satapp/SATUISrc/CSatUiViewAppUi.cpp	Tue May 25 13:18:28 2010 +0300
@@ -3472,6 +3472,7 @@
         {
         TFLOGSTRING( "CSatUiViewAppUi::StopPlayToneL\
             iPlayer exists" )
+        iPlayToneError = ESatSessionTerminatedByUser;
         iWait->AsyncStop();
         }
     if ( iAudioPlayer )
@@ -3488,6 +3489,7 @@
                 delete iPermanentNote;
                 iPermanentNote = NULL;
                 }
+            iPlayToneError = ESatSessionTerminatedByUser;
             iWait->AsyncStop();
             }
         else