--- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommandObserver.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommandObserver.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -438,34 +438,34 @@
TInt trId = iAsyProxyTRRecord->TrId();
DoDestroy( trId );
- //Reset buffer
- iObjectBuf->Reset();
- if ( ECmdGetObjectValue == iAsyProxyTRRecord->CmdId() )
- {
- iObjectBuf->ResizeL( KAccSrvObjectBaseStreamBufMaxSize );
- //Externalize aValue to aBuf
- RBufWriteStream wStrm;
- (void) wStrm.Open( *iObjectBuf );
- CleanupClosePushL( wStrm );
- aObjectCon.ExternalizeL( wStrm );
- wStrm.CommitL();
- CleanupStack::PopAndDestroy( &wStrm );
- }
- else
- {
- COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoProcessResponseL() - Nothing do to!");
- }
-
- // Release allocated buffer
if ( iObjectBuf )
{
+ //Reset buffer
+ iObjectBuf->Reset();
+ if ( ECmdGetObjectValue == iAsyProxyTRRecord->CmdId() )
+ {
+ iObjectBuf->ResizeL( KAccSrvObjectBaseStreamBufMaxSize );
+ //Externalize aValue to aBuf
+ RBufWriteStream wStrm;
+ (void) wStrm.Open( *iObjectBuf );
+ CleanupClosePushL( wStrm );
+ aObjectCon.ExternalizeL( wStrm );
+ wStrm.CommitL();
+ CleanupStack::PopAndDestroy( &wStrm );
+ }
+ else
+ {
+ COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoProcessResponseL() - Nothing do to!");
+ }
+
+ // Release allocated buffer
TPtr8 ptr( iObjectBuf->Ptr(0) );
iAsyProxyCommsSrvc->iAsyComms.ProcessResponse( trId,
&ptr,
aErrCode );
delete iObjectBuf;
- iObjectBuf = NULL;
- }
+ iObjectBuf = NULL;
+ }
else
{
iAsyProxyCommsSrvc->iAsyComms.ProcessResponse( trId,
--- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -141,10 +141,10 @@
{
COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommsService::~CASYProxyCommsService()" );
- Destroy( KDeleteAllRecords );
-
if ( iAsyProxyCommsStack )
{
+ Destroy( KDeleteAllRecords );
+
delete iAsyProxyCommsStack;
iAsyProxyCommsStack = 0;
}
--- a/accessoryservices/accessoryserver/src/ChargerContext/ChargingContextFSMBody.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/accessoryserver/src/ChargerContext/ChargingContextFSMBody.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -78,7 +78,7 @@
}
}
// Delete state objects
- for (TInt i = 1; i <= EChargerContextStateMaxValue; i++ )
+ for (TInt i = 1; i < EChargerContextStateMaxValue; i++ )
{
delete iStateArray[i];
iStateArray[i] = NULL;
@@ -111,7 +111,7 @@
COM_TRACE_( "[AccFW:AccServer] CChargingContextFSMBody::Transit()" );
TBool retVal(EFalse);
if ( ( EChargerContextStateUndefined < aNextState ) &&
- ( EChargerContextStateMaxValue >= aNextState ) )
+ ( EChargerContextStateMaxValue > aNextState ) )
{
iCurrentStateId = aNextState;
if ( NULL != iStateArray[iCurrentStateId])
@@ -173,7 +173,7 @@
COM_TRACE_( "[AccFW:AccServer] CChargingContextFSMBody::CurrentState()" );
MFSMState* currentState( NULL );
if ( ( EChargerContextStateUndefined < iCurrentStateId ) &&
- ( EChargerContextStateMaxValue >= iCurrentStateId ))
+ ( EChargerContextStateMaxValue > iCurrentStateId ))
{
currentState = iStateArray[iCurrentStateId];
}
@@ -191,7 +191,7 @@
TPtrC currentStateName;
currentStateName.Set( KNullDesC );
if ( ( EChargerContextStateUndefined < iCurrentStateId ) &&
- ( EChargerContextStateMaxValue >= iCurrentStateId ))
+ ( EChargerContextStateMaxValue > iCurrentStateId ))
{
currentStateName.Set( iStateArray[iCurrentStateId]->Name() );
}
--- a/accessoryservices/accessoryserver/src/Server/AccSrvSubBTControl.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvSubBTControl.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -408,6 +408,8 @@
TPckg<TBTDevAddr> BTDevAddrPckg( BTDevAddr );
aMessage.ReadL( KAccServParamPosFirst, BTDevAddrPckg );
+ // coverity[check_return]
+ // coverity[unchecked_value]
iServerModel->FindWithDeviceAddressL( MakeTUint64( BTDevAddr ), uniqueID );
iConnectionController->NotificationQueue().CompleteControlMessageL(
EBluetoothAudioLinkOpenReq, KErrNone, uniqueID );
--- a/accessoryservices/pluggeddisplay/edidparser/bwins/edidparseru.def Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/pluggeddisplay/edidparser/bwins/edidparseru.def Fri Mar 12 15:50:01 2010 +0200
@@ -54,4 +54,5 @@
?GetInterlacedAudioLatency@CCea861EdidParser@@QAEEXZ @ 53 NONAME ; unsigned char CCea861EdidParser::GetInterlacedAudioLatency(void)
?GetInterlacedVideoLatency@CCea861EdidParser@@QAEEXZ @ 54 NONAME ; unsigned char CCea861EdidParser::GetInterlacedVideoLatency(void)
?GetStandardTimings@CEdidParserBase@@QAEEH@Z @ 55 NONAME ; unsigned char CEdidParserBase::GetStandardTimings(int)
+ ?HasIEEERegistration@CCea861EdidParser@@QAEHXZ @ 56 NONAME ; int CCea861EdidParser::HasIEEERegistration(void)
--- a/accessoryservices/pluggeddisplay/edidparser/eabi/edidparseru.def Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/pluggeddisplay/edidparser/eabi/edidparseru.def Fri Mar 12 15:50:01 2010 +0200
@@ -56,4 +56,5 @@
_ZTI17CCea861EdidParser @ 55 NONAME ; #<TI>#
_ZTV17CCea861EdidParser @ 56 NONAME ; #<VT>#
_ZN15CEdidParserBase18GetStandardTimingsEi @ 57 NONAME
+ _ZN17CCea861EdidParser19HasIEEERegistrationEv @ 58 NONAME
--- a/accessoryservices/pluggeddisplay/edidparser/inc/cea861edidparser.h Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/pluggeddisplay/edidparser/inc/cea861edidparser.h Fri Mar 12 15:50:01 2010 +0200
@@ -156,6 +156,14 @@
IMPORT_C TBool IsVendorSpecificDataBlockSupported();
/**
+ * Indicates whether the sink has IEEE registration or not in the vendor specific data block
+ *
+ * @param none
+ * @return true/false
+ */
+ IMPORT_C TBool HasIEEERegistration();
+
+ /**
* Indicates whether or not Speaker Allocation Data Block is supported
*
*
--- a/accessoryservices/pluggeddisplay/edidparser/src/cea861ediddatatypes.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/pluggeddisplay/edidparser/src/cea861ediddatatypes.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -205,26 +205,15 @@
// delete all descriptor blocks
while( iDescriptorBlocks )
{
- TCEA861TEdidDescriptorBlockList* prev = iDescriptorBlocks;
- TCEA861TEdidDescriptorBlockList* last = prev;
- /* coverity[var_deref_op]*/
- if( prev->iNext )
- {
- last = prev->iNext;
- }
- while( last->iNext ) // go to last block
- {
- prev = prev->iNext;
- last = last->iNext;
- }
- prev->iNext = NULL;
- if( last == iDescriptorBlocks )
- {
- iDescriptorBlocks = NULL;
- prev = NULL;
- }
- delete last;
+ TCEA861TEdidDescriptorBlockList* node;
+
+ node = iDescriptorBlocks;
+ iDescriptorBlocks = iDescriptorBlocks->iNext;
+
+ delete node;
}
+ iDescriptorBlocks = NULL;
+
}
// End of file
--- a/accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -19,6 +19,8 @@
#include "cea861edidparser.h"
#include "trace.h"
+const TInt KIEEERegistrationID = 0x00000C03;
+
// ======== LOCAL FUNCTIONS ========
@@ -300,6 +302,24 @@
}
// ----------------------------------------------------------------------------
+// CCea861EdidParser::HasIEEERegistration
+//
+// ----------------------------------------------------------------------------
+//
+EXPORT_C TBool CCea861EdidParser::HasIEEERegistration()
+ {
+ FUNC_LOG;
+
+ if ( iVendorSpecificDataBlockSupported && iParsedInfo->iVendorSpecificData &&
+ iParsedInfo->iVendorSpecificData->iIEEE24bitRegistrationIdentifier == KIEEERegistrationID )
+ {
+ return ETrue;
+ }
+
+ return EFalse;
+ }
+
+// ----------------------------------------------------------------------------
// CCea861EdidParser::GetParsedInformation
//
// ----------------------------------------------------------------------------
@@ -577,6 +597,8 @@
{
return KErrOverflow;
}
+
+ TCEA861TEdidDescriptorBlockList* lastnode = iParsedInfo->iDescriptorBlocks;
for( TInt index = aIndex; index < KEdidParserSizeOfEdidBlock; index++ )
{
@@ -594,32 +616,21 @@
if( aData[index] != KEdidPaddingByte ) // padding = 0x00
{
- // start of 18-byte descriptors: See section 3.10.2 of VESA E-EDID Standard [10]
-
- TBool first = ETrue;
- if( iParsedInfo->iDescriptorBlocks == 0 )
- {
- iParsedInfo->iDescriptorBlocks
- = new ( ELeave ) TCEA861TEdidDescriptorBlockList();
- }
-
+ // start of 18-byte descriptors: See section 3.10.2 of E-EDID Standard [10]
// read the descriptors here
TEdidDescriptorBlock tmp = GetDescriptorBlock( aData, index );
- if( first )
+
+ if( iParsedInfo->iDescriptorBlocks == 0 )
{
- first = EFalse;
- iParsedInfo->iDescriptorBlocks->iData = tmp;
- continue;
+ iParsedInfo->iDescriptorBlocks = new ( ELeave ) TCEA861TEdidDescriptorBlockList();
+ lastnode = iParsedInfo->iDescriptorBlocks;
}
- TCEA861TEdidDescriptorBlockList* last =
- iParsedInfo->iDescriptorBlocks;
- while( last->iNext != 0 ) // go to last block
+ else
{
- last = last->iNext;
+ lastnode->iNext = new ( ELeave ) TCEA861TEdidDescriptorBlockList();
+ lastnode = lastnode->iNext;
}
- last->iNext = new ( ELeave ) TCEA861TEdidDescriptorBlockList();
- last = last->iNext;
- last->iData = tmp;
+ lastnode->iData = tmp;
}
else
{
@@ -1482,7 +1493,7 @@
ReadCea861SpeakerAllocationDataBlock( aData, aIndex, L1 );
break;
case 5:
- //VESA DTC Data Block
+ //DTC Data Block
ReadUnknownTagCode( aData, aIndex, L1 );
break;
case 6:
@@ -1509,10 +1520,6 @@
// TODO: these should be read as well, not just as unknown
ReadUnknownTagCode( aData, aIndex, L1 );
break;
- default:
- // if tag-code is unknown, we still must read through it
- ReadUnknownTagCode( aData, aIndex, L1 );
- break;
}
return KErrNone;
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1413,24 +1413,45 @@
availableIndex++;
}
-
- if( ( (KDefaultCEAModePhysImgAspRatioNr == iEdidParserPtr->GetAspectRatioLandscape())
- && (KDefaultCEAModePhysImgAspRatioDr == iEdidParserPtr->GetAspectRatioPortrait()) )
- && !defaultCEAmode )
+ // If the Vendor Specific Data Block supported and it has IEEE registration number then it is HDMI
+ if ( iExtensionParserPtr && iExtensionParserPtr->IsVendorSpecificDataBlockSupported() && iExtensionParserPtr->HasIEEERegistration() )
{
- THdmiDviTimings timings;
-
- // Get a timing item for default CEA Mode (1)
- const TTimingItem* item = TimingByIndex( KDefaultCEAModeIndex, ETimingModeCEA );
- if( item )
- {
- Mem::FillZ( ( TAny* )&timings, sizeof( timings ) );
- FillHdmiDviTimings( *item, timings );
- retVal = aHdmiConfigs.Append( timings );
- ERROR( retVal, "Failed to append CEA timing in available config array" );
- }
- }
+ INFO( "<<<<<<<<<<<<<<It is HDMI connector>>>>>>>>>>>>>>" );
+ // Add default CEA mode 1 to the list if it is not there already
+ if( ( (KDefaultCEAModePhysImgAspRatioNr == iEdidParserPtr->GetAspectRatioLandscape())
+ && (KDefaultCEAModePhysImgAspRatioDr == iEdidParserPtr->GetAspectRatioPortrait()) )
+ && !defaultCEAmode )
+
+ {
+ THdmiDviTimings timings;
+
+ // Get a timing item for default CEA Mode (1)
+ const TTimingItem* item = TimingByIndex( KDefaultCEAModeIndex, ETimingModeCEA );
+ if( item )
+ {
+ Mem::FillZ( ( TAny* )&timings, sizeof( timings ) );
+ FillHdmiDviTimings( *item, timings );
+ retVal = aHdmiConfigs.Append( timings );
+ ERROR( retVal, "Failed to append CEA timing in available config array" );
+ }
+ }
+ }
+ else // It is DVI connector
+ {
+ TInt modecount = aHdmiConfigs.Count();
+
+ INFO( "<<<<<<<<<<<<<<It is DVI connector>>>>>>>>>>>>>>" );
+ while( modecount-- )
+ {
+ // Change it to DVI mode as it is existing in both Supported and available configurations
+ aHdmiConfigs[ modecount ].iConnector = TTvSettings::EDVI;
+
+ // Version should be zeroed for non-HDMI
+ aHdmiConfigs[ modecount ].iTvHdmiVersion = 0;
+ aHdmiConfigs[ modecount ].iTvHdmiRevision = 0;
+ }
+ }
INFO( "Filtered list -- END" );
supportedModes.Close();
--- a/accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -431,6 +431,7 @@
{
delete iTargetSession;
iTargetSession = NULL;
+ LEAVEL(err);
}
}
@@ -485,6 +486,7 @@
{
delete iTargetSession;
iTargetSession = NULL;
+ LEAVEL(err);
}
}
--- a/accessoryservices/tspclientmapper/tsrc/public/basic/tspclienttestmodule/init/tspclienttestmodule.ini Sat Feb 20 00:05:00 2010 +0200
+++ b/accessoryservices/tspclientmapper/tsrc/public/basic/tspclienttestmodule/init/tspclienttestmodule.ini Fri Mar 12 15:50:01 2010 +0200
@@ -1,8 +1,8 @@
#
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/commonservices/PlatformEnv/disknotifyhandler/tsrc/disknotifyhandlertest/init/disknotifyhandlertest.ini Sat Feb 20 00:05:00 2010 +0200
+++ b/commonservices/PlatformEnv/disknotifyhandler/tsrc/disknotifyhandlertest/init/disknotifyhandlertest.ini Fri Mar 12 15:50:01 2010 +0200
@@ -1,3 +1,15 @@
+# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
#
# This is STIFTestFramework initialization file
# Comment lines start with '#'-character.
--- a/commonservices/PlatformEnv/platformver/tsrc/platformvertest/init/platformvertest.ini Sat Feb 20 00:05:00 2010 +0200
+++ b/commonservices/PlatformEnv/platformver/tsrc/platformvertest/init/platformvertest.ini Fri Mar 12 15:50:01 2010 +0200
@@ -1,8 +1,8 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/commonservices/PlatformEnv/sysversioninfo/tsrc/sysutiltests/init/sysutiltests.ini Sat Feb 20 00:05:00 2010 +0200
+++ b/commonservices/PlatformEnv/sysversioninfo/tsrc/sysutiltests/init/sysutiltests.ini Fri Mar 12 15:50:01 2010 +0200
@@ -1,8 +1,8 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/commonservices/PlatformEnv/tsrc/platformenvtest/init/platformenvtest.ini Sat Feb 20 00:05:00 2010 +0200
+++ b/commonservices/PlatformEnv/tsrc/platformenvtest/init/platformenvtest.ini Fri Mar 12 15:50:01 2010 +0200
@@ -1,8 +1,8 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/psmservices/psmserver/src/engine/psmbackupstorage.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/psmservices/psmserver/src/engine/psmbackupstorage.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -194,6 +194,7 @@
// Search correct set item for aKey
TBool setFound( EFalse );
RXmlEngNodeList<TXmlEngElement> nodeList;
+ CleanupClosePushL(nodeList);
aConfigSet.GetElementsByTagNameL(nodeList, KPsmSetItem);
TXmlEngElement setItem = nodeList.Next().AsElement();
@@ -205,7 +206,7 @@
if ( aKey == setItemKey )
{
- // Set found, no need to loop anumore
+ // Set found, no need to loop any more
setFound = ETrue;
}
else
@@ -214,7 +215,8 @@
setItem = nodeList.Next().AsElement();
}
}
-
+
+ CleanupStack::PopAndDestroy(&nodeList);
if ( !setFound )
{
COMPONENT_TRACE( ( _L( "PSM Server - CPsmBackupStorage::FindSetItemL() - Not found id:%i, LEAVE" ), aKey ) );
--- a/psmservices/psmserver/src/engine/psmstorage.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/psmservices/psmserver/src/engine/psmstorage.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -112,6 +112,7 @@
TBool setFound( EFalse );
TXmlEngElement settings;
RXmlEngNodeList<TXmlEngElement> nodeList;
+ CleanupClosePushL(nodeList);
if ( iStorageRoot.NotNull() )
{
@@ -141,7 +142,7 @@
settings = nodeList.Next().AsElement();
}
}
-
+ CleanupStack::PopAndDestroy(&nodeList);
if ( !setFound )
{
COMPONENT_TRACE( ( _L( "PSM Server - CPsmStorage::FindConfigurationSet() - Mode not found: %i, LEAVE" ), aMode ) );
@@ -166,6 +167,7 @@
// Get first setElemens
RXmlEngNodeList<TXmlEngElement> nodeList;
+ CleanupClosePushL(nodeList);
settings.GetElementsByTagNameL(nodeList, KPsmSetItem);
TXmlEngElement setElement = nodeList.Next().AsElement();
@@ -207,7 +209,7 @@
// handle next element set
setElement = nodeList.Next().AsElement();
}
-
+ CleanupStack::PopAndDestroy(&nodeList);
COMPONENT_TRACE( ( _L( "PSM Server - CPsmStorage::CreateConfigArrayL() - return" ) ) );
}
@@ -227,6 +229,7 @@
// Get first setElemens
RXmlEngNodeList<TXmlEngElement> nodeList;
+ CleanupClosePushL(nodeList);
settings.GetElementsByTagNameL(nodeList, KPsmSetItem);
TXmlEngElement setElement = nodeList.Next().AsElement();
@@ -287,6 +290,7 @@
setElement = nodeList.Next().AsElement();
}
+ CleanupStack::PopAndDestroy(&nodeList);
COMPONENT_TRACE( ( _L( "PSM Server - CPsmStorage::GetConfigurationL() - return" ) ) );
}
Binary file sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/cenrepsample/sensorframework.confml has changed
Binary file sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/cenrepsample/sensorframework_10282DEE.crml has changed
--- a/sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/group/bld.inf Sat Feb 20 00:05:00 2010 +0200
+++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/group/bld.inf Fri Mar 12 15:50:01 2010 +0200
@@ -27,15 +27,13 @@
// NOTE: If using ARS requirements all export operations should be done under this.
// 'abld test export'
+
+../cenrepsample/sensorframework.confml OS_LAYER_CONFML(sensorframework.confml)
+../cenrepsample/sensorframework_10282DEE.crml OS_LAYER_CRML(sensorframework_10282DEE.crml)
+
../../conf/SensorTestModule.cfg /epoc32/winscw/c/testframework/SensorTestModule.cfg
../../init/SensorTestModule.ini /epoc32/winscw/c/testframework/SensorTestModule.ini
-../cenrepsample/10282DEE.txt /epoc32/RELEASE/winscw/UDEB/Z/private/10202BE9/10282DEE.txt
-../cenrepsample/10282DEE.txt /epoc32/RELEASE/winscw/UREL/Z/private/10202BE9/10282DEE.txt
-../cenrepsample/10282DEE.txt /epoc32/data/Z/private/10202BE9/10282DEE_stub.txt
-../cenrepsample/1020507E.txt /epoc32/RELEASE/winscw/UDEB/Z/private/10202BE9/1020507E.txt
-../cenrepsample/1020507E.txt /epoc32/RELEASE/winscw/UREL/Z/private/10202BE9/1020507E.txt
-../cenrepsample/1020507E.txt /epoc32/data/Z/private/10202BE9/1020507E_stub.txt
../../rom/SensorServer_ats3.iby CORE_OS_LAYER_IBY_EXPORT_PATH(SensorServer_ats3.iby)
--- a/sensorservices/sensorserver/tsrc/sensorsrvtest/rom/sensorserver_ats3.iby Sat Feb 20 00:05:00 2010 +0200
+++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/rom/sensorserver_ats3.iby Fri Mar 12 15:50:01 2010 +0200
@@ -29,9 +29,6 @@
ECOM_PLUGIN(sensrvcondeval.dll, sensrvcondeval.rsc)
-data=ZPRIVATE\10202BE9\10282DEE_stub.txt PRIVATE\10202BE9\10282DEE.txt
-data=ZPRIVATE\10202BE9\1020507E_stub.txt PRIVATE\10202BE9\1020507E.txt
-
#endif // SENSORSERVERTEST_IBY
--- a/sysstatemgmt/ssmcmdlists/data/alarm_charging.rss Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/ssmcmdlists/data/alarm_charging.rss Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -226,7 +226,7 @@
name = "z:\\sys\\bin\\locod.exe";
execution_behaviour = ESsmFireAndForget;
monitor_info = r_mon_3_restarts_ignore;
- conditional_information = r_cond_feat_testatcommand;
+ conditional_information = r_cond_testatcommand_or_enableisicommunicationinusbchargingmode;
}
// ---------------------------------------------------------------------------
@@ -535,6 +535,26 @@
feature_id = KFeatureIdTestATCommand;
}
+// ---------------------------------------------------------------------------
+// r_cond_feat_enableisicommunicationinusbchargingmode
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_enableisicommunicationinusbchargingmode
+ {
+ feature_id = KFeatureIdEnableIsiCommunicationInUsbChargingMode;
+ }
+
+// ---------------------------------------------------------------------------
+// r_cond_testatcommand_or_certtesting
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_testatcommand_or_enableisicommunicationinusbchargingmode
+ {
+ lhs = r_cond_feat_testatcommand;
+ rhs = r_cond_feat_enableisicommunicationinusbchargingmode;
+ }
+
+
// monitoring.rss contains resource definitions, so it may not be included
// before entry point.
#include "monitoring.rss"
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndcentralrepository.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndcentralrepository.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,23 +12,8 @@
* Contributors:
*
* Description:
-* Name : conditiononcentrep.h
-* Part of : System Startup / Condition
-* Interface : None
* Declaration of CConditionOnCentRep and CConditionOnCentRepFlag
* classes.
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from conditiononcentrep.h to cndcentralrepository.h as part of Core OS transfer.
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndfeature.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndfeature.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,22 +12,7 @@
* Contributors:
*
* Description:
-* Name : conditiononfeature.h
-* Part of : System Startup / Condition
-* Interface : None
* Declaration of CConditionOnFeature class
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from conditiononfeature.h to cndfeature.h as part of Core OS transfer.
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndlogical.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndlogical.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,23 +12,8 @@
* Contributors:
*
* Description:
-* Name : boolexpr.h
-* Part of : System Startup / Condition
-* Interface : None
* Declaration of CBoolExpr, CLogicalNot, CLogicalAnd and
* CLogicalOr classes.
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from boolexpr.h to cndlogical.h as part of Core OS transfer.
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndpublishsubscribe.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/cndpublishsubscribe.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,22 +13,8 @@
*
* Description:
* Name : conditiononpubsub.h
-* Part of : System Startup / Condition
-* Interface : None
* Declaration of CConditionOnPubSub and CConditionOnPubSubFlag
* classes
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from conditiononpubsub.h to cndpublishsubscribe.h as part of Core OS transfer.
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditionevaluate.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditionevaluate.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,21 +13,7 @@
*
* Description:
* Name : resourcecondition.h
-* Part of : System Startup / Condition
-* Interface : None
* Declaration of ResourceCondition class
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.1
-* Nokia Core OS *
-* File renamed from resourcecondition.h to CConditionEvaluate.h as part of Core OS transfer.
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditionevaluatebase.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditionevaluatebase.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,22 +13,8 @@
*
* Description:
* Name : conditiononpubsub.h
-* Part of : System Startup / Condition
-* Interface : None
* Declaration of CConditionOnPubSub and CConditionOnPubSubFlag
* classes
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from conditiononpubsub.h to conditionevaluatebase.h as part of Core OS transfer.
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditionresourcetypes.rh Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditionresourcetypes.rh Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,19 +11,7 @@
// Contributors:
//
// Description:
-// Name : conditionresourcetypes.rh
-// Part of : System Startup / Condition
// Resource structure declarations for conditional checks.
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.0
-// Nokia Core OS *
//
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditiontypes.hrh Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/inc/conditiontypes.hrh Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,22 +12,8 @@
* Contributors:
*
* Description:
-* Name : conditiontypes.hrh
-* Part of : System Startup / Condition
-* Interface : None
* Identifiers for different condition types, for use in resource
* structs.
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-*
*/
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndcentralrepository.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndcentralrepository.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,21 +11,8 @@
// Contributors:
//
// Description:
-// Name : conditiononcentrep.cpp
-// Part of : System Startup / Condition
// Implementation of CConditionOnCentRep and
// CConditionOnCentRepFlag classes.
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from conditiononcentrep.cpp to cndcentralrepository.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndfeature.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndfeature.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,24 +11,12 @@
// Contributors:
//
// Description:
-// Name : conditiononfeature.cpp
-// Part of : System Startup / Starter
// Implementation of CConditionOnFeature class
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from conditiononfeature.cpp to cndfeature.cpp as part of Core OS transfer.
//
+
#include "cndfeature.h"
#include <featmgr/featurecontrol.h>
#include <featmgr/featmgr.h>
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndlogical.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndlogical.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : resourcecondition.cpp
-// Part of : System Startup / Condition
// Implementation of ResourceCondition class
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from resourcecondition.cpp to cndlogical.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndpublishsubscribe.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndpublishsubscribe.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,21 +11,8 @@
// Contributors:
//
// Description:
-// Name : conditiononpubsub.cpp
-// Part of : System Startup / Condition
// Implementation of CConditionOnPubSub and CConditionOnPubSubFlag
// classes
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from conditiononpubsub.cpp to cndpublishsubscribe.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/conditionevaluate.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/conditionevaluate.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : resourcecondition.cpp
-// Part of : System Startup / Condition
// Implementation of ResourceCondition class
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from resourcecondition.cpp to conditionevaluate.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/securitynotification.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/securitynotification.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,9 @@
* Contributors:
*
* Description:
-* Name : securitynotification.h
-* Part of : System Startup / Starter
* Interface : Domain, Security Notification API
* Parameter and constant definitions for launching
* security-related notifications using the Notifier Framework.
-* Version : %version: ou1s60rt#2.1.1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.1
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/simutils.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/simutils.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : simutils.h
-* Part of : System Startup / Starter
* Interface : Domain, SIM Utils API
* This file contains SIM Utils definitions of Startup subsystem.
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/ssmsecurityeventobserver.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/ssmsecurityeventobserver.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecurityeventobserver.h
-* Part of : System Startup / StrtSecObs
* Declaration of CStrtSecurityEventObserver class
-* Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
-* File renamed from strtsecurityeventobserver.h to ssmsecurityeventobserver.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/ssmsecuritynotecontroller.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/ssmsecuritynotecontroller.h Fri Mar 12 15:50:01 2010 +0200
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritynotecontroller.h
-* Part of : System Startup / StrtSecObs
* Declaration of CStrtSecurityNoteController class
-* Version : %version: 2 % << Don't touch! Updated by Synergy at check-out.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
-* File renamed from strtsecuritynotecontroller.h to ssmsecuritynotecontroller.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starter.hrh Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starter.hrh Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : starter.hrh
-* Part of : System Startup / Starter
* Interface : Domain, Extended Startup API
* Resource headers for projects StarterServer and StarterClient.
-* Version : %version: 6 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterclient.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterclient.h Fri Mar 12 15:50:01 2010 +0200
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : starterclient.h
-* Part of : System Startup / Starter
* Interface : Domain, System State Control API and Extended Startup API
* Declaration of RStarterSession interface
-* Version : %version: ou1s60rt#8 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterdomaincrkeys.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterdomaincrkeys.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : starterdomaincrkeys.h
-* Part of : System Startup / Starter
* Interface : Domain, Startup Status API.
* Domain Central Repository definitions of System Startup subsystem.
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterprivatecrkeys.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterprivatecrkeys.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : starterprivatecrkeys.h
-* Part of : System Startup / Starter
* Interface : Private, Starter Configuration API.
* Private Central Repository definitions of Starter component.
-* Version : %version: 2 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptation.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptation.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,9 @@
* Contributors:
*
* Description:
-* Name : startupadaptation.h
-* Part of : System Startup / Starter
* Interface : Domain, Startup Adaptation API
* This header file defines the Startup Adaptation API command
* interface used to issue commands towards adaptation.
-* Version : %version: ou1s60rt#6 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptation.inl Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptation.inl Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,9 @@
* Contributors:
*
* Description:
-* Name : startupadaptation.inl
-* Part of : System Startup / Starter
* Interface : Domain, Startup Adaptation API
* Implementation for inline functions of CStartupAdaptation
* class.
-* Version : %version: ou1s60rt#7 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationcommands.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationcommands.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,8 +12,6 @@
* Contributors:
*
* Description:
-* Name : startupadaptationcommands.h
-* Part of : System Startup / Starter
* Interface : Domain, Startup Adaptation API
* This header file defines the startup adaptation API commands
* and their parameters.
@@ -21,16 +19,6 @@
* - Command definitions
* - Command parameter definitions
* - Response parameter definitions
-* Version : %version: ou1s60rt#12.1.4 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
@@ -661,52 +649,58 @@
*/
enum TPreferredLanguage
- { // ISO 639 GSM 0338
- EPrefLangEnglish = 1, // EN 1
- EPrefLangFrench = 2, // FR 3
- EPrefLangGerman = 3, // DE 0
- EPrefLangSpanish = 4, // ES 4
- EPrefLangItalian = 5, // IT 2
- EPrefLangSwedish = 6, // SV 6
- EPrefLangDanish = 7, // DA 7
- EPrefLangNorwegian = 8, // NO 10
- EPrefLangFinnish = 9, // FI 9
- EPrefLangPortuguese = 13, // PT 8
- EPrefLangTurkish = 14, // TR 12
- EPrefLangIcelandic = 15, // IS 36
- EPrefLangRussian = 16, // RU 35
- EPrefLangHungarian = 17, // HU 13
- EPrefLangDutch = 18, // NL 5
- EPrefLangCzech = 25, // CS 32
- EPrefLangSlovak = 26, // SK
- EPrefLangPolish = 27, // PL 14
- EPrefLangSlovenian = 28, // SL
- EPrefLangPrcChinese = 31, // ZH
- EPrefLangJapanese = 32, // JA
- EPrefLangThai = 33, // TH
- EPrefLangArabic = 37, // AR 34
- EPrefLangTagalog = 39, // TL
- EPrefLangBulgarian = 42, // BG
- EPrefLangCatalan = 44, // CA
- EPrefLangCroatian = 45, // HR
- EPrefLangEstonian = 49, // ET
- EPrefLangFarsi = 50, // FA
- EPrefLangGreek = 54, // EL 11
- EPrefLangHebrew = 57, // IW 33
- EPrefLangHindi = 58, // HI
- EPrefLangIndonesian = 59, // IN
- EPrefLangKorean = 65, // KO
- EPrefLangLatvian = 67, // LV
- EPrefLangLithuanian = 68, // LT
- EPrefLangMalay = 70, // MS
- EPrefLangMarathi = 72, // MR
- EPrefLangRomanian = 78, // RO
- EPrefLangSerbian = 79, // SR
- EPrefLangUkrainian = 93, // UK
- EPrefLangUrdu = 94, // UR
- EPrefLangVietnamese = 96, // VI
- EPrefLangBasque = 102, // EU
- EPrefLangGalician = 103 // GL
+ { // ISO 639 GSM 0338
+ EPrefLangEnglish = 1, // EN 1
+ EPrefLangFrench = 2, // FR 3
+ EPrefLangGerman = 3, // DE 0
+ EPrefLangSpanish = 4, // ES 4
+ EPrefLangItalian = 5, // IT 2
+ EPrefLangSwedish = 6, // SV 6
+ EPrefLangDanish = 7, // DA 7
+ EPrefLangNorwegian = 8, // NO 10
+ EPrefLangFinnish = 9, // FI 9
+ EPrefLangAmerican = 10, // EN
+ EPrefLangPortuguese = 13, // PT 8
+ EPrefLangTurkish = 14, // TR 12
+ EPrefLangIcelandic = 15, // IS 36
+ EPrefLangRussian = 16, // RU 35
+ EPrefLangHungarian = 17, // HU 13
+ EPrefLangDutch = 18, // NL 5
+ EPrefLangCzech = 25, // CS 32
+ EPrefLangSlovak = 26, // SK
+ EPrefLangPolish = 27, // PL 14
+ EPrefLangSlovenian = 28, // SL
+ EPrefLangTaiwanChinese = 29, // TC
+ EPrefLangHongKongChinese = 30, // HK
+ EPrefLangPrcChinese = 31, // ZH
+ EPrefLangJapanese = 32, // JA
+ EPrefLangThai = 33, // TH
+ EPrefLangArabic = 37, // AR 34
+ EPrefLangTagalog = 39, // TL
+ EPrefLangBulgarian = 42, // BG
+ EPrefLangCatalan = 44, // CA
+ EPrefLangCroatian = 45, // HR
+ EPrefLangEstonian = 49, // ET
+ EPrefLangFarsi = 50, // FA
+ EPrefLangCanadianFrench = 51, // CF
+ EPrefLangGreek = 54, // EL 11
+ EPrefLangHebrew = 57, // IW 33
+ EPrefLangHindi = 58, // HI
+ EPrefLangIndonesian = 59, // IN
+ EPrefLangKorean = 65, // KO
+ EPrefLangLatvian = 67, // LV
+ EPrefLangLithuanian = 68, // LT
+ EPrefLangMalay = 70, // MS
+ EPrefLangMarathi = 72, // MR
+ EPrefLangBrazilianPortuguese = 76, // BP
+ EPrefLangRomanian = 78, // RO
+ EPrefLangSerbian = 79, // SR
+ EPrefLangLatinAmericanSpanish = 83, // LS
+ EPrefLangUkrainian = 93, // UK
+ EPrefLangUrdu = 94, // UR
+ EPrefLangVietnamese = 96, // VI
+ EPrefLangBasque = 102, // EU
+ EPrefLangGalician = 103 // GL
};
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationcommands.inl Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationcommands.inl Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,9 @@
* Contributors:
*
* Description:
-* Name : startupadaptationcommands.inl
-* Part of : System Startup / Starter
* Interface : Domain, Startup Adaptation API
* Implementation for inline functions of classes defined in
* startupadaptationcommands.h.
-* Version : %version: 2 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationevents.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationevents.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,24 +12,12 @@
* Contributors:
*
* Description:
-* Name : startupadaptationevents.h
-* Part of : System Startup / Starter
* Interface : Domain, Startup Adaptation API
* This header file defines the startup adaptation API events
* and their parameters.
* This file contains the following sections:
* - Event definitions
* - Event parameter definitions
-* Version : %version: 5 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationobserver.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupadaptationobserver.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,9 @@
* Contributors:
*
* Description:
-* Name : startupadaptationobserver.h
-* Part of : System Startup / Starter
* Interface : Domain, Startup Adaptation API
* This header file defines the startup adaptation API observer
* interface used to return responses and deliver events.
-* Version : %version: ou1s60rt#5 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.1
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupdomainpskeys.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupdomainpskeys.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : startupdomainpskeys.h
-* Part of : System Startup / Starter
* Interface : Domain, System State API
* This file contains Domain Publish & Subscribe definitions of Startup subsystem.
-* Version : %version: ou1s60rt#12 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupreason.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/startupreason.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,8 @@
* Contributors:
*
* Description:
-* Name : startupreason.h
-* Part of : System Startup / Starter
* Interface : Domain, Startup Reason API
* Contains enumeration of valid system startup reasons.
-* Version : %version: 2 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.1
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecnoterequestqueue.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecnoterequestqueue.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecnoterequestqueue.h
-* Part of : System Startup / StrtSecObs
* Declaration of CStrtSecNoteRequestQueue class
-* Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
-*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecphaseobserver.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecphaseobserver.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,19 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecphaseobserver.h
-* Part of : System Startup / StrtSecObs
* Declaration of CStrtSecPhaseObserver class
-* Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecuritynotetype.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecuritynotetype.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,19 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritynotetype.h
-* Part of : System Startup / StrtSecNote
* Definition of TStrtSecurityNoteType enumeration.
-* Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecuritystatus.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/strtsecuritystatus.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritystatus.h
-* Part of : System Startup / Starter
-* Interface : None
* TStrtSecurityStatus enumeration.
-* Version : %version: ou1s60rt#4 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.1
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/src/ssmsecurityeventobserver.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/src/ssmsecurityeventobserver.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecurityeventobserver.cpp
-// Part of : System Startup / StrtSecObs
// Implementation of CStrtSecurityEventObserver class
-// Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1.1
-// Nokia Core OS *
-// File renamed from strtsecurityeventobserver.cpp to ssmsecurityeventobserver.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/src/ssmsecuritynotecontroller.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/src/ssmsecuritynotecontroller.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecuritynotecontroller.cpp
-// Part of : System Startup / StrtSecObs
// Implementation of CStrtSecurityNoteController class
-// Version : %version: 2 % << Don't touch! Updated by Synergy at check-out.
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1.1
-// Nokia Core OS *
-// File renamed from strtsecuritynotecontroller.cpp to ssmsecuritynotecontroller.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/src/strtsecnoterequestqueue.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/src/strtsecnoterequestqueue.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,19 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecnoterequestqueue.cpp
-// Part of : System Startup / StrtSecObs
// Implementation of CStrtSecNoteRequestQueue class
-// Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1.1
-// Nokia Core OS *
//
--- a/sysstatemgmt/systemstatereferenceplugins/clayer/src/strtsecphaseobserver.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/clayer/src/strtsecphaseobserver.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,19 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecphaseobserver.cpp
-// Part of : System Startup / StrtSecObs
// Implementation of CStrtSecPhaseObserver class
-// Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1.1
-// Nokia Core OS *
//
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmddevicesecuritycheck.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmddevicesecuritycheck.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtdevlockcheck.h
-* Part of : System Startup / StrtDevLockPlg
* Declaration of CStrtDevLockCheck class.
-* Version : %version: 1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.2
-* Nokia Core OS *
-* File renamed from strtdevlockcheck.h to cmddevicesecuritycheck.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmdsimsecuritycheck.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmdsimsecuritycheck.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritychecktask.h
-* Part of : System Startup / Starter
* Declaration of CStrtSecurityCheckTask class
-* Version : %version: ou1s60rt#5.1.1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from strtsecuritychecktask.h to cmdsimsecuritycheck.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/securitynoteobserver.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/securitynoteobserver.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritynoteobserver.h
-* Part of : System Startup / Starter
-* Interface : None
* Declaration of CStrtSecurityNoteObserver class.
-* Version : %version: ou1s60rt#4 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from strtsecuritynoteobserver.h to securitynoteobserver.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/ssmrefcustomcmdcommon.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/ssmrefcustomcmdcommon.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritychecktask.h
-* Part of : System Startup / Starter
* Declaration of CStrtSecurityCheckTask class
-* Version : %version: ou1s60rt#5.1.1 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from strtsecuritychecktask.h to ssmrefcustomcmdcommon.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/ssmsecuritychecknotifier.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/ssmsecuritychecknotifier.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,21 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsecuritynote.h
-* Part of : System Startup / Starter
-* Interface : None
* Declaration of CStrtSecurityNote class.
-* Version : %version: ou1s60rt#4 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
-* File renamed from strtsecuritynote.h to ssmsecuritychecknotifier.h as part of Core OS transfer.
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/swppolicy_simstatus.h Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/swppolicy_simstatus.h Fri Mar 12 15:50:01 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,20 +12,7 @@
* Contributors:
*
* Description:
-* Name : strtsimstatusmgr.h
-* Part of : System Startup / Starter
-* Interface : None
* Declaration of TStrtSimStatusMgr class.
-* Version : %version: ou1s60rt#7 %
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* Template version: 4.0
-* Nokia Core OS *
*
*/
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtdevlockcheck.cpp
-// Part of : System Startup / StrtDevLockPlg
// Implementation of CStrtDevLockCheck class.
-// Version : %version: 1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1.1
-// Nokia Core OS *
-// File renamed from strtdevlockcheck.cpp to cmddevicesecuritycheck.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdsimsecuritycheck.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdsimsecuritycheck.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecuritychecktask.cpp
-// Part of : System Startup / Starter
// Implementation of CStrtSecurityCheckTask class
-// Version : %version: ou1s60rt#7.1.1 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from strtsecuritychecktask.cpp to cmdsimsecuritycheck.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/securitynoteobserver.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/securitynoteobserver.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecuritynoteobserver.cpp
-// Part of : System Startup / Starter
// Implementation of CStrtSecurityNoteObserver class.
-// Version : %version: 3 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from strtsecuritynoteobserver.cpp to securitynoteobserver.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,20 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsecuritynote.cpp
-// Part of : System Startup / Starter
// Implementation of CStrtSecurityNote class.
-// Version : %version: 4 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
-// File renamed from strtsecuritynote.cpp to ssmsecuritychecknotifier.cpp as part of Core OS transfer.
//
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/swppolicy_simstatus.cpp Sat Feb 20 00:05:00 2010 +0200
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/swppolicy_simstatus.cpp Fri Mar 12 15:50:01 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -11,19 +11,7 @@
// Contributors:
//
// Description:
-// Name : strtsimstatusmgr.cpp
-// Part of : System Startup / Starter
// Implementation of TStrtSimStatusMgr class.
-// Version : %version: 7 %
-// This material, including documentation and any related computer
-// programs, is protected by copyright controlled by Nokia. All
-// rights are reserved. Copying, including reproducing, storing,
-// adapting or translating, any or all of this material requires the
-// prior written consent of Nokia. This material also contains
-// confidential information which may not be disclosed to others
-// without the prior written consent of Nokia.
-// Template version: 4.1
-// Nokia Core OS *
//
@@ -37,6 +25,7 @@
#include "ssmuiproviderdll.h"
#include "swppolicy_simstatus.h"
+#include "ssmdebug.h"
#include <ssm/ssmswppolicy.h>
#include <ssm/ssmstatemanager.h>
@@ -221,9 +210,20 @@
{
(void)aSwp;
(void)aSeverity;
+ (void)aError;
TRequestStatus* rs = &aStatus;
+#if defined(_DEBUG)
+ if(KErrNone != aError)
+ {
+ DEBUGPRINT3A("ERROR: Request SwP change for SIM status (SwP key %d) completed with error %d", aSwp.Key(), aError);
+ }
+ //Complete the status with the error which inturn panics SSM server
User::RequestComplete(rs, aError);
+#else // _DEBUG
+ //Completing the status with KErrNone to avoid panic in SSM server
+ User::RequestComplete(rs, KErrNone);
+#endif // _DEBUG
}
void CSimStatuspolicy::HandleCleReturnValueCancel()