--- a/devicediagnostics/devdiagapp/inc/devdiagengine.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/devdiagapp/inc/devdiagengine.h Thu Jul 15 18:24:21 2010 +0300
@@ -281,6 +281,13 @@
* requests.
*/
virtual void DoCancel();
+
+ /**
+ * From CActive.
+ * This function is called when RunL leaves
+ *
+ */
+ virtual TInt RunError( TInt aError );
private: // From base class MDiagEngineObserver
--- a/devicediagnostics/devdiagapp/inc/devdiagruntimereqsinfo.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/devdiagapp/inc/devdiagruntimereqsinfo.h Thu Jul 15 18:24:21 2010 +0300
@@ -185,7 +185,13 @@
* requests.
*/
virtual void DoCancel();
-
+
+ /**
+ * From CActive.
+ * This function is called when RunL leaves
+ *
+ */
+ virtual TInt RunError( TInt aError );
private: // Data
--- a/devicediagnostics/devdiagapp/src/devdiagengine.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/devdiagapp/src/devdiagengine.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -626,6 +626,16 @@
}
// ---------------------------------------------------------------------------
+// CDevDiagEngine::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDevDiagEngine::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDevDiagEngine::RunError error: %d", aError );
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
// From class CActive.
// The active object cancellation function.
// ---------------------------------------------------------------------------
--- a/devicediagnostics/devdiagapp/src/devdiagruntimereqsInfo.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/devdiagapp/src/devdiagruntimereqsInfo.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -353,6 +353,16 @@
}
// ---------------------------------------------------------------------------
+// CDevDiagRuntimeReqsInfo::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDevDiagRuntimeReqsInfo::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDevDiagRuntimeReqsInfo::RunError( %d )", aError )
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
// From CActive.
// This function is called to cancel any outstanding asynchronous requests.
// ---------------------------------------------------------------------------
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/inc/diaginternalmemoryplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/inc/diaginternalmemoryplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -118,6 +118,11 @@
* Handle active object completion event
*/
virtual void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ virtual TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/src/diaginternalmemoryplugin.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/src/diaginternalmemoryplugin.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -306,7 +306,16 @@
}
}
-
+// ---------------------------------------------------------------------------
+// CDiagInternalMemoryPlugin::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagInternalMemoryPlugin::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagInternalMemoryPlugin::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------
// From CActive
// CDiagInternalMemoryPlugin::DoCancel
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercableengine.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercableengine.h Thu Jul 15 18:24:21 2010 +0300
@@ -138,6 +138,11 @@
void RunL();
/**
+ * Handle when RunL leaves
+ */
+ TInt RunError( TInt aError );
+
+ /**
* Handle cancel
*/
void DoCancel();
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargercableengine.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargercableengine.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -436,6 +436,16 @@
}
}
+// ---------------------------------------------------------------------------
+// CDiagBatteryChargerCableTestEngine::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagBatteryChargerCableTestEngine::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagBatteryChargerCableTestEngine::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------------------
// CDiagHeadsetCableTestEngine::DoCancel
// Handles cancel request
--- a/devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserpluginmodel.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserpluginmodel.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -702,12 +702,14 @@
// ---------------------------------------------------------------------------
TInt CDiagBrowserPluginModel::RunError( TInt aError )
{
- LOGSTRING2( "CDiagBrowserPluginModel::RunError( %d )", aError )
+ LOGSTRING2( "CDiagBrowserPluginModel::RunError aError( %d )", aError )
// Try to continue test execution by retrying the secondary connection.
//TRAPD( error, RetryConnectionL() );
//return error;
- HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
+ TInt err(KErrNone);
+ TRAP( err, HandleTestEndL( CDiagResultsDatabaseItem::EFailed ));
+ LOGSTRING2( "CDiagBrowserPluginModel::RunError err( %d )", err )
return KErrNone;
}
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestpdpengine.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestpdpengine.h Thu Jul 15 18:24:21 2010 +0300
@@ -157,6 +157,11 @@
* Handle active object completion event
*/
void RunL();
+
+ /**
+ * Handle if RunL leaves
+ */
+ TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -129,7 +129,8 @@
* Handle active object completion event
*/
void RunL();
-
+
+
/**
* Handle cancel
*/
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestpdpengine.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestpdpengine.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -422,7 +422,17 @@
};
LOGSTRING("CDiagDataNetworkTestPDPEngine::RunL()");
}
-
+
+// ---------------------------------------------------------------------------
+// CDiagDataNetworkTestPDPEngine::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagDataNetworkTestPDPEngine::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagDataNetworkTestPDPEngine::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------
// CDiagDataNetworkTestPDPEngine::DoCancel()
//
--- a/devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudioplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudioplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -274,6 +274,11 @@
*/
virtual void RunL();
+ /**
+ * Handle RunL leaves
+ */
+ virtual TInt RunError( TInt aError );
+
/**
* Handle cancel
*/
--- a/devicediagnostics/diagplugins/diagearpieceplugin/src/diagaudioplugin.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagearpieceplugin/src/diagaudioplugin.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -1246,6 +1246,16 @@
}
// ---------------------------------------------------------------------------
+// CDiagAudioPlugin::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagAudioPlugin::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagAudioPlugin::RunError( %d )", aError )
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
// From CActive
// CDiagAudioPlugin::DoCancel
// ---------------------------------------------------------------------------
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/inc/diagexternalmediacardplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagexternalmediacardplugin/inc/diagexternalmediacardplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -115,6 +115,11 @@
* Handle active object completion event
*/
virtual void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ virtual TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/src/diagexternalmediacardplugin.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagexternalmediacardplugin/src/diagexternalmediacardplugin.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -304,7 +304,16 @@
}
}
-
+// ---------------------------------------------------------------------------
+// CDiagExternalMediaCardPlugin::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagExternalMediaCardPlugin::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagExternalMediaCardPlugin::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------
// From CActive
// CDiagExternalMediaCardPlugin::DoCancel
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcableengine.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcableengine.h Thu Jul 15 18:24:21 2010 +0300
@@ -126,6 +126,11 @@
* Handle active object completion event, used to handle internal trigger in our plug-in
*/
void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetcableengine.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetcableengine.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -404,6 +404,16 @@
}
}
+// ---------------------------------------------------------------------------
+// CDiagHeadsetCableTestEngine::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagHeadsetCableTestEngine::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagHeadsetCableTestEngine::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------------------
// CDiagHeadsetCableTestEngine::DoCancel
// Handles cancel request
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakerplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakerplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -271,6 +271,11 @@
* Handle active object completion event
*/
virtual void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ virtual TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/src/diagspeakerplugin.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagloudspeakerplugin/src/diagspeakerplugin.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -1229,7 +1229,17 @@
break;
}
}
-
+
+// ---------------------------------------------------------------------------
+// CDiagSpeakerPlugin::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagSpeakerPlugin::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagSpeakerPlugin::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------
// From CActive
// CDiagSpeakerPlugin::DoCancel
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoverageplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoverageplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -76,6 +76,11 @@
* @see CActive
*/
void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/src/diagnetcoverageplugin.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagnetcoverageplugin/src/diagnetcoverageplugin.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -239,7 +239,17 @@
}
}
-
+
+// ---------------------------------------------------------------------------
+// CDiagNetCoveragePlugin::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagNetCoveragePlugin::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagNetCoveragePlugin::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------
// From CActive
// CDiagNetCoveragePlugin::DoCancel
--- a/devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestengine.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestengine.h Thu Jul 15 18:24:21 2010 +0300
@@ -130,6 +130,11 @@
* Handle active object completion event, used to handle internal trigger in our plug-in
*/
void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbcabletestengine.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbcabletestengine.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -476,7 +476,17 @@
RunUSBCableTestL();
}
}
-
+
+// ---------------------------------------------------------------------------
+// CDiagUSBCableTestEngine::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagUSBCableTestEngine::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagUSBCableTestEngine::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------------------
// CDiagHeadsetCableTestEngine::DoCancel
// Handles cancel request
--- a/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibrateplugin.h Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibrateplugin.h Thu Jul 15 18:24:21 2010 +0300
@@ -112,6 +112,11 @@
* Handle active object completion event
*/
virtual void RunL();
+
+ /**
+ * Handle RunL leaves
+ */
+ virtual TInt RunError( TInt aError );
/**
* Handle cancel
--- a/devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibrateplugin.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibrateplugin.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -560,7 +560,16 @@
}
}
-
+// ---------------------------------------------------------------------------
+// CDiagVibratePlugin::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CDiagVibratePlugin::RunError( TInt aError )
+ {
+ LOGSTRING2( "CDiagVibratePlugin::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ---------------------------------------------------------------------------
// From CActive
// CDiagVibratePlugin::DoCancel
--- a/omadm/omadmappui/src/NSmlDMFotaContainer.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/omadm/omadmappui/src/NSmlDMFotaContainer.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -42,7 +42,7 @@
#include <swi/sisregistrysession.h>
#include <csxhelp/dm.hlp.hrh>
-
+#include <eiklbx.h>
#include <apgtask.h>
@@ -638,7 +638,8 @@
// Create the itemlist
iFotaListBox = new (ELeave) CAknDoubleStyleListBox;
iFotaListBox->SetContainerWindowL( *this );
- iFotaListBox->ConstructL( this, EAknListBoxViewerFlags );
+ iFotaListBox->ConstructL( this, EAknListBoxViewerFlags |
+ CEikListBox::EDisableItemSpecificMenu | CEikListBox::EViewerFlag );
// Set up/down arrows at bottom of the screen (scrollbar)
iFotaListBox->CreateScrollBarFrameL( ETrue );
iFotaListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOn,
--- a/omadm/omadmappui/src/NSmlDMFotaView.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/omadm/omadmappui/src/NSmlDMFotaView.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -913,7 +913,8 @@
//
TInt CDLObserver::RunError( TInt aError )
{
- return aError;
+ FTRACE( FPrint(_L("CDLObserver::RunError error as %d"),aError ) );
+ return KErrNone;
}
// End of File
--- a/omadm/omadmextensions/adapters/devinfo/src/nsmldmdevinfoadapter.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/omadm/omadmextensions/adapters/devinfo/src/nsmldmdevinfoadapter.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -457,7 +457,13 @@
if ( segment == KNSmlDMDevInfoLangNodeName )
{
TLanguage language = User::Language();
+ // value to mask off the leftmost 6 bits in language that holds the operator id
+ const TUint KDialectMask=0x03FF;
+ language = static_cast<TLanguage>(language & KDialectMask);
+
TBuf8<2> langCode;
+ DBG_FILE_CODE("CNSmlDmInfoAdapter::FetchLeafObjectL(): %d",language);
+
switch ( language )
{
case ELangEnglish:
@@ -703,6 +709,7 @@
langCode = KNSmlDMEnglish;
}
aObject.InsertL( 0, langCode );
+ DBG_FILE_CODE("CNSmlDmInfoAdapter::FetchLeafObjectL(): %s",langCode);
}
else
if ( segment == KNSmlDMDevInfoDmVNodeName )
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/ccmdialogmonitor.h Mon Jun 21 15:26:00 2010 +0300
+++ b/pnpmobileservices/pnpms/OnlineSupport/inc/ccmdialogmonitor.h Thu Jul 15 18:24:21 2010 +0300
@@ -105,8 +105,8 @@
* @since 2.0
* @return void
*/
- void RunL();
-
+ void RunL();
+
/**
* From CActive Cancels any outstanding request.
* @since 2.0
@@ -117,7 +117,7 @@
/**
* From CActive Handles a leave occurring in the request completion event handler RunL().
*/
- //TInt RunError( TInt aError );
+ TInt RunError( TInt aError );
private:
/**
--- a/pnpmobileservices/pnpms/OnlineSupport/src/ccmdialogmonitor.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/pnpmobileservices/pnpms/OnlineSupport/src/ccmdialogmonitor.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -385,6 +385,15 @@
*/
}
+// ---------------------------------------------------------------------------
+// CCMDialogMonitor::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CCMDialogMonitor::RunError( TInt aError )
+ {
+ LOGSTRING2( "CCMDialogMonitor::RunError( %d )", aError )
+ return KErrNone;
+ }
// ========================== OTHER EXPORTED FUNCTIONS =========================
// None
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/cwaitdialogmonitor.h Mon Jun 21 15:26:00 2010 +0300
+++ b/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/cwaitdialogmonitor.h Thu Jul 15 18:24:21 2010 +0300
@@ -83,6 +83,11 @@
void RunL();
/**
+ * Handle RunL leaves
+ */
+ TInt RunError( TInt aError );
+
+ /**
* From CActive Cancels any outstanding request.
* @since 2.0
* @return void
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/cwaitdialogmonitor.cpp Mon Jun 21 15:26:00 2010 +0300
+++ b/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/cwaitdialogmonitor.cpp Thu Jul 15 18:24:21 2010 +0300
@@ -127,6 +127,16 @@
iNotifier.WaitDialogDismissedL( iStatus.Int() );
}
+// ---------------------------------------------------------------------------
+// CWaitDialogMonitor::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CWaitDialogMonitor::RunError( TInt /*aError*/ )
+ {
+// LOGSTRING2( "CWaitDialogMonitor::RunError( %d )", aError )
+ return KErrNone;
+ }
+
// ========================== OTHER EXPORTED FUNCTIONS =========================
// None