# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282118594 -10800
# Node ID 072a9626b290abd29d592d71dd04785a1c419b95
# Parent  c6215323ad55a85fa9c587eab1e5ec4f9a6229bf
Revision: 201033
Kit: 201033

diff -r c6215323ad55 -r 072a9626b290 accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp
--- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -453,7 +453,7 @@
 void CAccSrvConnectionController::HandleConnectionUpdateValidationL( 
     const TAccPolGenericID& aGenericID, 
     TAccPolGenericID& aOldGenericId,
-    const CAccSrvSettingsHandler* aCaller,    
+    const CAccSrvSettingsHandler* /*aCaller*/,    
     TInt aError )
     {
     COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::HandleConnectionUpdateValidationL()" );
diff -r c6215323ad55 -r 072a9626b290 accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp
--- a/accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/accessoryservices/pluggeddisplay/edidparser/src/cea861edidparser.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -600,7 +600,8 @@
         
     TCEA861TEdidDescriptorBlockList* lastnode = iParsedInfo->iDescriptorBlocks;
 
-    for( TInt index = aIndex; index < KEdidParserSizeOfEdidBlock; index++ )
+    TInt index = aIndex;
+    while( index < KEdidParserSizeOfEdidBlock )
         {
         // Offset. If this is a newer version of CEA-861,
         // then this is skipped (we are already past the offset)
@@ -635,6 +636,7 @@
         else
             {
             // this is only padding, no need to do anything
+            index++;
             }
 
         // after the descriptors there is padding to fill Extension block to 128 bytes.
diff -r c6215323ad55 -r 072a9626b290 accessoryservices/pluggeddisplay/pluggeddisplayengine/group/pluggeddisplayengine.mmp
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/group/pluggeddisplayengine.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/group/pluggeddisplayengine.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -66,6 +66,7 @@
 LIBRARY					accclient.lib
 LIBRARY					efsrv.lib
 LIBRARY					fbscli.lib
+LIBRARY					sysutil.lib
 
 #ifdef TRACE_INTO_FILE
 LIBRARY					flogger.lib
diff -r c6215323ad55 -r 072a9626b290 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -25,6 +25,7 @@
 #include <e32math.h>
 #include <accessoriescrkeys.h>
 #include <centralrepository.h>
+#include <sysutil.h>
 
 #include "pdeconstants.h"
 #include "tvoutconfigforhdmi.h"
@@ -542,7 +543,6 @@
 					INFO_1( "Updating the Rawdata for the Block %d...", iCurrentBlock );
 					iEdidParserPtr->UpdateRawDataL(dataBlockDes);
 					
-					iCurrentBlock++;
 					if( inbrOfExtensions >= 2 )
 						{
  						inbrOfExtensions = inbrOfExtensions - 2;
@@ -555,6 +555,7 @@
 
 				if( inbrOfExtensions )
 					{
+					iCurrentBlock++;
 					iRetryCounter = KErrNone;
 					
 					if( ReadEDIDDataL() != KErrNone )
@@ -587,12 +588,11 @@
 								}
  							}
 						}
+					TRACE_EDID_DATA( *iEdidParserPtr );
+					
+					iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetched );
+					iRetryCounter = KErrNone;
 					}
-
-				TRACE_EDID_DATA( *iEdidParserPtr );
-				
-				iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetched );
-				iRetryCounter = KErrNone;
 				}
             else
                 {
@@ -637,7 +637,7 @@
 // RunL
 //------------------------------------------------------------------------------
 //
-TInt CEDIDHandler::RunError( TInt aError )
+TInt CEDIDHandler::RunError( TInt /*aError*/ )
     {
     FUNC_LOG;
     
@@ -771,7 +771,65 @@
 		}
     Mem::FillZ( ( TAny* )&aTimings.iProductName, ( sizeof( TChar ) * KProductNameChars ) );
     Mem::FillZ( ( TAny* )&aTimings.iProductDescription, ( sizeof( TChar ) * KProductDescriptorsChars ) );
-    aTimings.iSourceType = THdmiDviTimings::ESourceTypeUnknown;
+    	
+    TInt err = KErrNone;
+    CDeviceTypeInformation* deviceTypeInfo = NULL;
+    TRAP(err, deviceTypeInfo = SysUtil::GetDeviceTypeInfoL());
+    
+    if(KErrNone == err)
+        {
+        #define MAX(a, b) (((a)>(b)) ? (a) : (b))
+        #define MIN(a, b) (((a)<(b)) ? (a) : (b))
+        
+        TPtrC16 bufPtrModelCode;
+        TPtrC16 bufPtrManufacturerName;
+        TUint loopCount;
+        TUint maxLen;
+        TUint maxCharsLen;
+        TUint minNameCharsLen;
+        TUint minDescritopCharsLen;
+        
+        deviceTypeInfo->GetManufacturerName(bufPtrManufacturerName);
+        deviceTypeInfo->GetModelCode(bufPtrModelCode);
+        maxLen = MAX(bufPtrModelCode.Length(),bufPtrManufacturerName.Length());
+        maxCharsLen = MAX(KProductNameChars,KProductDescriptorsChars);
+        minNameCharsLen = MIN(KProductNameChars, bufPtrModelCode.Length());
+        minDescritopCharsLen = MIN(KProductDescriptorsChars, bufPtrManufacturerName.Length());
+        
+        INFO_1( "maxLen : %d", maxLen);
+        INFO_1( "maxCharsLen : %d", maxCharsLen);
+        INFO_1( "minNameCharsLen : %d", minNameCharsLen);
+        INFO_1( "minDescritopCharsLen : %d", minDescritopCharsLen);
+        
+        for(loopCount = 0; loopCount < maxLen; loopCount++)
+            {
+            if(loopCount >= maxCharsLen)
+                {
+                        break;
+                }
+            else
+                {
+                    if(loopCount <  minNameCharsLen)
+                        {
+                        aTimings.iProductName[loopCount] = bufPtrModelCode[loopCount];
+                        INFO_1( "aTimings.iProductName : %d", aTimings.iProductName[loopCount].GetLowerCase());
+                        }
+                    if(loopCount <  minDescritopCharsLen)
+                        {
+                        aTimings.iProductDescription[loopCount] = bufPtrManufacturerName[loopCount];
+                        INFO_1( "aTimings.iProductDescription : %d", aTimings.iProductDescription[loopCount].GetLowerCase());
+                        }
+                }
+            }
+        INFO("Before Deleting Pointer deviceTypeInfo");
+        delete deviceTypeInfo;
+        INFO("After Deleting Pointer deviceTypeInfo");
+        aTimings.iSourceType = THdmiDviTimings::ESourceTypePCGeneral;
+        }
+    else
+        {
+        aTimings.iSourceType = THdmiDviTimings::ESourceTypeUnknown;
+        }
     }
 
 //------------------------------------------------------------------------------
@@ -1557,6 +1615,30 @@
 		    else // It is DVI connector
 		    {
 				TInt modecount = aHdmiConfigs.Count();
+
+				if( !modecount )
+					{
+					THdmiDviTimings timings;
+					
+					INFO( "==No EDID available from the Sink. Setting DMT 4" );
+					// No EDID data available from the sink
+					// Default VGA resolution should be selected
+					const TTimingItem* item = TimingByIndex( KDefaultDMTModeIndex, ETimingModeDMT );
+					if( item )
+						{
+						Mem::FillZ( ( TAny* )&timings, sizeof( timings ) );
+						FillHdmiDviTimings( *item, timings );
+						timings.iTvPhysicalImageAspectRatioNumerator = 4;
+						timings.iTvPhysicalImageAspectRatioDenominator = 3;
+						retVal = aHdmiConfigs.Append( timings );
+						ERROR_1( retVal, "Failed to append DMT timing: %S in array", item->iTimingName );
+						if( retVal == KErrNone )
+							{
+							modecount = 1;
+							ceaMode = EFalse;
+							}
+						}
+					}
 				
 				while( modecount-- )
 				  {
diff -r c6215323ad55 -r 072a9626b290 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -645,7 +645,7 @@
 //
 // ----------------------------------------------------------------------------
 //
-TInt CTVOutConfigForHDMI::RunError( TInt aError )
+TInt CTVOutConfigForHDMI::RunError( TInt /*aError*/ )
     {
     FUNC_LOG;
 
diff -r c6215323ad55 -r 072a9626b290 accessoryservices/remotecontrolfw/server/group/remconserver.mmp
--- a/accessoryservices/remotecontrolfw/server/group/remconserver.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/accessoryservices/remotecontrolfw/server/group/remconserver.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -30,6 +30,10 @@
 UID 			0x0 0x101f9067
 VENDORID		0x70000001
 
+// Non-default stack size to allow for plugins which use Qt APIs. 
+// (The value is a standard for Symbian Qt apps, generated by qmake.)
+EPOCSTACKSIZE 0x14000
+
 SOURCEPATH		../src
 SOURCE			activehelper.cpp
 SOURCE			bearermanager.cpp
diff -r c6215323ad55 -r 072a9626b290 commonservices/commonengine/config/export.mk
--- a/commonservices/commonengine/config/export.mk	Tue Jul 06 15:43:30 2010 +0300
+++ b/commonservices/commonengine/config/export.mk	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -17,11 +17,11 @@
 
 # commonengine's actual configuration export makefile
 
-MAKEFILE = 	/sf/os/devicesrv/commonservices/commonengine/config/export.mk
+MAKEFILE = 	$(EPOCROOT)/sf/os/devicesrv/commonservices/commonengine/config/export.mk
 $(call push,MAKEFILE_STACK,$(MAKEFILE))
 
-CONFFILES =		$(MAKEFILEDIR)../conf/commonengine.confml              	/epoc32/rom/config/confml_data/s60/ \
-							$(MAKEFILEDIR)../conf/commonengine_1020503B.crml 	     	/epoc32/rom/config/confml_data/s60/
+CONFFILES =		$(MAKEFILEDIR)../conf/commonengine.confml              	$(EPOCROOT)/epoc32/rom/config/confml_data/s60/ \
+							$(MAKEFILEDIR)../conf/commonengine_1020503B.crml 	     	$(EPOCROOT)/epoc32/rom/config/confml_data/s60/
 		
 commonengine_config					:: commonengine_config-conf
 commonengine_config-conf 		::
diff -r c6215323ad55 -r 072a9626b290 commonservices/commonengine/makefile
--- a/commonservices/commonengine/makefile	Tue Jul 06 15:43:30 2010 +0300
+++ b/commonservices/commonengine/makefile	Wed Aug 18 11:03:14 2010 +0300
@@ -2,7 +2,7 @@
 
 #Define this platform as default if nothing is defined
 
-MAKEFILE = /sf/os/devicesrv/commonservices/commonengine/makefile
+MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/commonservices/commonengine/makefile
 
 commonengine_all    :: commonengine_config
 
diff -r c6215323ad55 -r 072a9626b290 devicesrv_pub/common_platform_security_definitions_api/config/export.mk
--- a/devicesrv_pub/common_platform_security_definitions_api/config/export.mk	Tue Jul 06 15:43:30 2010 +0300
+++ b/devicesrv_pub/common_platform_security_definitions_api/config/export.mk	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -18,14 +18,14 @@
 
 # common_platform_security_definitions_api's actual configuration export makefile
 
-MAKEFILE = 	/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/config/export.mk
+MAKEFILE = 	$(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/config/export.mk
 $(call push,MAKEFILE_STACK,$(MAKEFILE))
 
-INCFILES =		$(MAKEFILEDIR)../inc/data_caging_path_literals.hrh    /epoc32/include/ \
-							$(MAKEFILEDIR)../inc/data_caging_paths_for_iby.hrh    /epoc32/include/ \
-							$(MAKEFILEDIR)../inc/data_caging_paths.hrh            /epoc32/include/ \
-							$(MAKEFILEDIR)../inc/data_caging_paths_strings.hrh    /epoc32/include/ \
-							$(MAKEFILEDIR)../inc/data_caged_locations.mk          /epoc32/include/
+INCFILES =		$(MAKEFILEDIR)../inc/data_caging_path_literals.hrh    $(EPOCROOT)/epoc32/include/ \
+							$(MAKEFILEDIR)../inc/data_caging_paths_for_iby.hrh    $(EPOCROOT)/epoc32/include/ \
+							$(MAKEFILEDIR)../inc/data_caging_paths.hrh            $(EPOCROOT)/epoc32/include/ \
+							$(MAKEFILEDIR)../inc/data_caging_paths_strings.hrh    $(EPOCROOT)/epoc32/include/ \
+							$(MAKEFILEDIR)../inc/data_caged_locations.mk          $(EPOCROOT)/epoc32/include/
 
 
 common_platform_security_config				:: common_platform_security_config-inc
diff -r c6215323ad55 -r 072a9626b290 devicesrv_pub/common_platform_security_definitions_api/makefile
--- a/devicesrv_pub/common_platform_security_definitions_api/makefile	Tue Jul 06 15:43:30 2010 +0300
+++ b/devicesrv_pub/common_platform_security_definitions_api/makefile	Wed Aug 18 11:03:14 2010 +0300
@@ -2,7 +2,7 @@
 
 #Define this platform as default if nothing is defined
 
-MAKEFILE = /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile
+MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile
 
 common_platform_security_all    	:: common_platform_security_config
 
diff -r c6215323ad55 -r 072a9626b290 devicesrv_pub/platform_path_definitions_api/config/export.mk
--- a/devicesrv_pub/platform_path_definitions_api/config/export.mk	Tue Jul 06 15:43:30 2010 +0300
+++ b/devicesrv_pub/platform_path_definitions_api/config/export.mk	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -18,12 +18,12 @@
 
 # platform_path_definitions_api's actual configuration export makefile
 
-MAKEFILE = 	/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/config/export.mk
+MAKEFILE = 	$(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/config/export.mk
 $(call push,MAKEFILE_STACK,$(MAKEFILE))
 
-INCFILES =		$(MAKEFILEDIR)../inc/platform_paths.hrh               /epoc32/include/ \
-							$(MAKEFILEDIR)../inc/non_foundation_paths.hrh         /epoc32/include/ \
-							$(MAKEFILEDIR)../inc/iconlocations.hrh                /epoc32/include/
+INCFILES =		$(MAKEFILEDIR)../inc/platform_paths.hrh               $(EPOCROOT)/epoc32/include/ \
+							$(MAKEFILEDIR)../inc/non_foundation_paths.hrh         $(EPOCROOT)/epoc32/include/ \
+							$(MAKEFILEDIR)../inc/iconlocations.hrh                $(EPOCROOT)/epoc32/include/
 		
 platform_path_config				:: platform_path_config-inc
 platform_path_config-inc 		::
diff -r c6215323ad55 -r 072a9626b290 devicesrv_pub/platform_path_definitions_api/makefile
--- a/devicesrv_pub/platform_path_definitions_api/makefile	Tue Jul 06 15:43:30 2010 +0300
+++ b/devicesrv_pub/platform_path_definitions_api/makefile	Wed Aug 18 11:03:14 2010 +0300
@@ -2,7 +2,7 @@
 
 #Define this platform as default if nothing is defined
 
-MAKEFILE = /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile
+MAKEFILE = $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile
 
 platform_path_all    	:: platform_path_config
 
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticsclient/group/hwrmhapticsclient.mmp
--- a/hwrmhaptics/hapticsclient/group/hwrmhapticsclient.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticsclient/group/hwrmhapticsclient.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -41,8 +41,8 @@
 OS_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
-LIBRARY         ws32.lib
 LIBRARY         ecom.lib
 LIBRARY         hwrmhapticspacketizer.lib 
 LIBRARY         hwrmhapticseffectdatagetterfw.lib
 
+SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticsclient/src/hwrmhapticssession.cpp
--- a/hwrmhaptics/hapticsclient/src/hwrmhapticssession.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticsclient/src/hwrmhapticssession.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -61,6 +61,7 @@
     // server components
     if ( err == KErrNone )
         {
+		aStatus = KRequestPending;
         SendReceive( EHWRMHapticsService, aStatus );
         }
     else
@@ -115,7 +116,9 @@
                                             TRequestStatus& aStatus ) const
     {
     COMPONENT_TRACE( ( _L( "RHWRMHapticsSession::ExecuteAsyncOperation - commandId(%d), aStatus(%d)" ), aCommand, aStatus.Int() ) );
-    
+
+    aStatus = KRequestPending;
+
     SendReceive( aCommand, aArgs, aStatus );
     
     COMPONENT_TRACE( ( _L( "RHWRMHapticsSession::ExecuteAsyncOperation - return" ) ) );
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticseffectdatagetterfw/group/hwrmhapticseffectdatagetterfw.mmp
--- a/hwrmhaptics/hapticseffectdatagetterfw/group/hwrmhapticseffectdatagetterfw.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticseffectdatagetterfw/group/hwrmhapticseffectdatagetterfw.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -36,3 +36,4 @@
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
 
+SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticspacketizer/group/hwrmhapticspacketizer.mmp
--- a/hwrmhaptics/hapticspacketizer/group/hwrmhapticspacketizer.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticspacketizer/group/hwrmhapticspacketizer.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -36,3 +36,5 @@
 LIBRARY         euser.lib
 LIBRARY         ecom.lib
 LIBRARY         centralrepository.lib
+
+SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp
--- a/hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -59,3 +59,4 @@
 
 LANG            SC
 
+SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticspluginservice/group/hwrmhapticspluginservice.mmp
--- a/hwrmhaptics/hapticspluginservice/group/hwrmhapticspluginservice.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticspluginservice/group/hwrmhapticspluginservice.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -36,4 +36,6 @@
 LIBRARY                 bafl.lib
 LIBRARY                 estor.lib
 
+SMPSAFE
+
 // end of file
diff -r c6215323ad55 -r 072a9626b290 hwrmhaptics/hapticsserver/group/hwrmhapticsserver.mmp
--- a/hwrmhaptics/hapticsserver/group/hwrmhapticsserver.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/hwrmhaptics/hapticsserver/group/hwrmhapticsserver.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -46,3 +46,5 @@
 LIBRARY         euser.lib
 LIBRARY         ecom.lib
 LIBRARY         hwrmhapticspluginmanager.lib
+
+SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 resourceinterfaces/fmtransmittercontrol/src/HWRMFmTxStatusObserver.cpp
--- a/resourceinterfaces/fmtransmittercontrol/src/HWRMFmTxStatusObserver.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourceinterfaces/fmtransmittercontrol/src/HWRMFmTxStatusObserver.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -203,20 +203,7 @@
 // -----------------------------------------------------------------------------
 //
 TFmTxState CHWRMFmTxStatusObserver::Status()
-    {
-    COMPONENT_TRACE1( _L( "HWRM FM Tx Client - CHWRMFmTxStatusObserver::Status()" ));
-    
-    TInt value(EFmTxStateUnknown);
-    
-    TInt err = RProperty::Get(KPSUidHWRMFmTx, KHWRMFmTxStatus, value);
-    
-    if ( err == KErrNone )
-        {
-		COMPONENT_TRACE1( _L( "HWRM FM Tx Client - CHWRMFmTxStatusObserver::Status - RPropert::Get ok" ) );        	
-        	
-        iFmTxState = static_cast<TFmTxState>(value);
-        }
-    
+    {    
     COMPONENT_TRACE2( _L( "HWRM FM Tx Client - CHWRMFmTxStatusObserver::Status - return 0x%x" ), iFmTxState );
     
     return iFmTxState;
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/hwresourcesmgr/extendedlight/src/HWRMExtendedLightStatusObserver.cpp
--- a/resourcemgmt/hwresourcesmgr/extendedlight/src/HWRMExtendedLightStatusObserver.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/extendedlight/src/HWRMExtendedLightStatusObserver.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -81,7 +81,10 @@
 
     // Cancel property separately, as the following Cancel() call doesn't seem to 
     // cause DoCancel to fire.
-    iProperty.Cancel();
+    if( iProperty.Handle() )
+      {
+      iProperty.Cancel();
+      }
     
     Cancel();
     
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/hwresourcesmgr/power/inc/HWRMPower.h
--- a/resourcemgmt/hwresourcesmgr/power/inc/HWRMPower.h	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/power/inc/HWRMPower.h	Wed Aug 18 11:03:14 2010 +0300
@@ -62,9 +62,20 @@
 * User::WaitForRequest(status);
 * User::LeaveIfError(status.Int());
 * 
-* // Start receiving periodical voltage measurements.
+* // Start receiving periodical power measurements.
+* //
+* // Note: There is a maximum reporting period defined for each product through the
+* //       CenRep Key KPowerMaxReportingPeriod defined in HWRMPowerDomainCRKeys.h.
+* //       The reporting will stop after this maximum reporting period by default.
+* //       The application can configure this dynamically.
+* //       Setting maximum report period to zero results in infinite notifications.
+* //
 * TRequestStatus& statusStart;
-* TIntervalMultiple intervalMultiple = EThreeTimesBaseTimeInterval;
+* TInt intervalMultiple = 3; // Three times the base time interval.
+* //
+* // Note: The base time interval is different for each product.
+* //       GetBaseTimeIntervalL API returns this value.
+* //
 * power->StartAverageVoltageReporting(statusStart, intervalMultiple);
 *  
 * User::WaitForRequest(statusStart);
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/group/bld.inf
--- a/resourcemgmt/powerandmemorynotificationservice/group/bld.inf	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/bld.inf	Wed Aug 18 11:03:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -49,6 +49,7 @@
 ../group/PwrCliTests.bat   /epoc32/data/z/system/test/pwrclitests.bat
 #ifdef SYSLIBS_TEST
 ../group/PwrCliTest.iby    /epoc32/rom/include/pwrclitest.iby
+../inc/e32consf.h		   /epoc32/include/e32consf.h
 #endif
 
 PRJ_TESTMMPFILES
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/group/t_pwrbasic.mmp
--- a/resourcemgmt/powerandmemorynotificationservice/group/t_pwrbasic.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/t_pwrbasic.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -29,6 +29,8 @@
 SOURCE          t_pwrbasic.cpp
 
 LIBRARY         euser.lib
-LIBRARY         powermgrcli.lib 
+LIBRARY         powermgrcli.lib
+LIBRARY 		efsrv.lib
+LIBRARY 		charconv.lib
 
 SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/group/t_pwroffevents.mmp
--- a/resourcemgmt/powerandmemorynotificationservice/group/t_pwroffevents.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/t_pwroffevents.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -41,6 +41,7 @@
 #if defined (SYMBIAN_SSM_GRACEFUL_SHUTDOWN)
 LIBRARY			ssmcmn.lib estor.lib
 #endif
+LIBRARY 		charconv.lib
 
 
 SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/group/t_shutdownserver.mmp
--- a/resourcemgmt/powerandmemorynotificationservice/group/t_shutdownserver.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/t_shutdownserver.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -42,6 +42,7 @@
 #if defined (SYMBIAN_SSM_GRACEFUL_SHUTDOWN)
 LIBRARY			ssmcmn.lib estor.lib
 #endif
+LIBRARY 		charconv.lib
 
 
 SMPSAFE
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/inc/e32consf.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/resourcemgmt/powerandmemorynotificationservice/inc/e32consf.h	Wed Aug 18 11:03:14 2010 +0300
@@ -0,0 +1,163 @@
+// 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:
+//
+// Description:
+//
+
+#ifndef __E32CONSF_H__
+#define __E32CONSF_H__
+
+#include <e32std.h> 
+#include <e32cons.h>
+#include <e32test.h>
+#include <f32file.h>
+
+#include <utf.h>
+
+class CConsoleFile: public CConsoleBase 
+    {
+public:
+    static CConsoleFile* New(const TDesC& aLogFileName)
+        {
+        CConsoleFile* self = new CConsoleFile();
+        if (self)
+            {
+            if (self->Construct(aLogFileName))
+                {
+                delete self;
+                self = NULL;
+                }
+            }
+        return self;
+        }
+    
+    virtual ~CConsoleFile()
+        {
+        iFile.Close();
+        iFs.Close();
+        }
+
+private:
+    CConsoleFile()
+    :CConsoleBase()
+        {
+        }
+    
+    TInt Construct(const TDesC& aLogFileName)
+        {
+        TInt err=iFs.Connect();
+        if (!err)
+            {
+            (void)iFs.MkDirAll(aLogFileName);
+            if (iFile.Replace(iFs, aLogFileName, EFileShareExclusive | EFileWrite))
+                {
+                err=iFile.Create(iFs, aLogFileName, EFileShareExclusive | EFileWrite);            
+                }
+            }
+        return err;
+        }
+
+    void DoWriteL(const TDesC &aDes)
+        {
+        HBufC8* outBuf = CnvUtfConverter::ConvertFromUnicodeToUtf8L(aDes);
+        (void)iFile.Write(*outBuf);
+        delete outBuf;
+        }
+    
+private: // CConsoleBase
+    virtual TInt Create(const TDesC& /*aTitle*/,TSize /*aSize*/)
+        {
+        return KErrNone;
+        }
+    
+    virtual void Read(TRequestStatus& aStatus)
+        {
+        TRequestStatus* status = &aStatus;
+        User::RequestComplete(status, (TInt)EKeyNull);
+        }
+    
+    virtual void ReadCancel()
+        {
+        }
+    
+    virtual void Write(const TDesC &aDes)
+        {
+        // so that RTest::Title can be called before the TrapHandler has been created
+        CTrapCleanup* tc = NULL;
+        if (!User::TrapHandler())
+            {
+            tc = CTrapCleanup::New();
+            }
+        TRAP_IGNORE(DoWriteL(aDes));
+        delete tc;
+        }
+    
+    virtual TPoint CursorPos() const
+        {
+        return TPoint(0,0);
+        }
+    
+    virtual void SetCursorPosAbs(const TPoint& /*aPoint*/)
+        {
+        }
+    
+    virtual void SetCursorPosRel(const TPoint& /*aPoint*/)
+        {
+        }
+    
+    virtual void SetCursorHeight(TInt /*aPercentage*/)
+        {
+        }
+    
+    virtual void SetTitle(const TDesC& /*aTitle*/)
+        {
+        }
+    
+    virtual void ClearScreen()
+        {
+        }
+    
+    virtual void ClearToEndOfLine()
+        {
+        }
+    
+    virtual TSize ScreenSize() const
+        {
+        return TSize(0,0);
+        }
+    
+    virtual TKeyCode KeyCode() const
+        {
+        return EKeyNull;
+        }
+    
+    virtual TUint KeyModifiers() const
+        {
+        return 0;
+        }
+
+private:
+    RFs iFs;
+    RFile iFile;
+    };
+
+void LogRTestToFile(RTest& aTest)
+    {
+    RProcess myProcess;
+    TParsePtrC parsePtr(myProcess.FileName());
+	TFileName logFileName;
+	TPtrC fileNameWithoutExtension = parsePtr.Name();
+    logFileName.Format(_L("c:\\logs\\testexecute\\%S.htm"), &fileNameWithoutExtension);
+    aTest.SetConsole(CConsoleFile::New(logFileName)); // SMH - Setting NULL console is OK
+    }
+
+#endif // __E32CONSF_H__
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwrbasic.cpp
--- a/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwrbasic.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwrbasic.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -19,6 +19,7 @@
 #include <e32test.h>        //RTest
 #include <e32svr.h>         //RDebug
 #include <savenotf.h>       //RSaveSession, MSaveObserver, CSaveNotifier
+#include <e32consf.h>		//for logging to file
 
 static RTest TheTest(_L("T_PwrBasic"));
 const TInt KOneSec = 1000000;
@@ -447,6 +448,8 @@
 
 TInt E32Main()
 	{
+	LogRTestToFile(TheTest);
+    TheTest.Title();
 	__UHEAP_MARK;
 	CTrapCleanup* tc = CTrapCleanup::New();
     TEST(tc != NULL);
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwroffevents.cpp
--- a/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwroffevents.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwroffevents.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -18,6 +18,7 @@
 #include <e32test.h>        //RTest
 #include <e32svr.h>         //RDebug
 #include <savenotf.h>       //RSaveSession, MSaveObserver, CSaveNotifier
+#include <e32consf.h>		//for logging to file
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <shutdownsrv.h>    //CServShutdownServer
 #else //SYMBIAN_ENABLE_SPLIT_HEADERS
@@ -288,6 +289,8 @@
 
 TInt E32Main()
 	{
+	LogRTestToFile(TheTest);
+    TheTest.Title();
 	__UHEAP_MARK;
 	CTrapCleanup* tc = CTrapCleanup::New();
     TEST(tc != NULL);
diff -r c6215323ad55 -r 072a9626b290 resourcemgmt/powerandmemorynotificationservice/tsrc/t_shutdownserver.cpp
--- a/resourcemgmt/powerandmemorynotificationservice/tsrc/t_shutdownserver.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/tsrc/t_shutdownserver.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -16,6 +16,7 @@
 #include <e32test.h>        //RTest
 #include <e32svr.h>         //RDebug
 #include <savenotf.h>       //RSaveSession, MSaveObserver, CSaveNotifier
+#include <e32consf.h>		//for logging to file
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <shutdownsrv.h>    //CServShutdownServer
 #else //SYMBIAN_ENABLE_SPLIT_HEADERS
@@ -294,6 +295,8 @@
 
 TInt E32Main()
 	{
+	LogRTestToFile(TheTest);
+    TheTest.Title();
 	CTrapCleanup* tc = CTrapCleanup::New();
     TEST(tc != NULL);
 
diff -r c6215323ad55 -r 072a9626b290 sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp
--- a/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -471,6 +471,11 @@
         // Reset state
         ResetState( ETrue );
         }
+    else
+    	{
+    	if( iTimerToSend )
+    		iTimerToSend->Start();
+    	}
     }
 
 // ----------------------------------------------------------------------------------
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/group/bld.inf
--- a/sysstatemgmt/group/bld.inf	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/group/bld.inf	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -24,6 +24,9 @@
 
 PRJ_MMPFILES
 
+#include "../systemstatemgr/group/bld.inf"
+#include "../systemstatereferenceplugins/group/bld.inf"
+#include "../systemstateplugins/group/bld.inf"
 #include "../ssmmapperutility/group/bld.inf"
 #include "../ssmpolicyplugins/group/bld.inf"
 #include "../ssmutilityplugins/group/bld.inf"
@@ -32,9 +35,6 @@
 #include "../syslangutil/group/bld.inf"
 #include "../sysrestart/group/bld.inf"
 #include "../systemstarter/group/bld.inf"
-#include "../systemstatemgr/group/bld.inf"
-#include "../systemstatereferenceplugins/group/bld.inf"
-#include "../systemstateplugins/group/bld.inf"
 #include "../sysuiprovider/group/bld.inf"
 
 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss
--- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -114,6 +114,10 @@
        //prio 0x7EE1
        r_cmd_nmailagent 	//MBEN-83CFQE
 #endif //FF_EMAIL_FRAMEWORK
+			//prio 0x7EE0
+			 ,r_cmd_activitymonmediamgr,	//FMAO-867HYW
+			 //prio 0x7EDF
+			 r_cmd_mediamgr			//FMAO-867HYW
     	 };
     }
 
@@ -293,6 +297,20 @@
     }
 #endif //FF_EMAIL_FRAMEWORK
 
+// ---------------------------------------------------------------------------
+// r_cmd_activitymonmediamgr
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonmediamgr
+    {
+    priority = 0x7EE0;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmWaitForSignal;
+    dllname = "ssmactivitycmd.dll";
+    ordinal = 1; // SsmActivityCmdNewL
+    retries = 2;
+    dll_data = r_dlldata_activitymonitor_timeout;
+    }
 
 // ---------------------------------------------------------------------------
 // r_cmd_autosync
@@ -329,6 +347,17 @@
     monitor_info = r_mon_3_restarts_ignore;
     }
 
+// ---------------------------------------------------------------------------
+// r_cmd_mediamgr
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_mediamgr
+    {
+    priority = 0x7EDF;
+    name = "z:\\sys\\bin\\MediaManager.exe";
+    execution_behaviour = ESsmFireAndForget;
+    background = 1; // To background
+    }
 
 // ---------------------------------------------------------------------------
 // r_cmd_msgnotifier
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/ssmpolicyplugins/ssmfailpolicy/src/ssmfailpolicy.cpp
--- a/sysstatemgmt/ssmpolicyplugins/ssmfailpolicy/src/ssmfailpolicy.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/ssmpolicyplugins/ssmfailpolicy/src/ssmfailpolicy.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -60,7 +60,7 @@
 // ---------------------------------------------------------------------------
 //
 TBool CSsmFailPolicy::GetNextState(
-    TSsmState aCurrentTransition,
+    TSsmState INFO_PARAM( aCurrentTransition ),
     TInt /*aReason*/,
     TInt ERROR_PARAM( aError ),
     TInt ERROR_PARAM( aSeverity ),
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp
--- a/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp	Wed Aug 18 11:03:14 2010 +0300
@@ -401,7 +401,8 @@
     {
     TBool isValid( EFalse );
     //Validate and get the selected settings
-    TRAPD( errorCode, isValid = ValidateAndGetSettingsL( aLastSelectedLang, aLastSelectedRegion, aLastSelectedCollation ) );
+	TInt errorCode = KErrNone;
+    TRAP( errorCode, isValid = ValidateAndGetSettingsL( aLastSelectedLang, aLastSelectedRegion, aLastSelectedCollation ) );
     ERROR_1( errorCode, "Validation failed for the selected Language, region and Collation with error %d", errorCode );
     return isValid;
     }
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappgood.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappgood.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappgood.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -27,7 +27,6 @@
 USERINCLUDE   	../inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
-//SYSTEMINCLUDE	/epoc32/include/techview
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY     euser.lib 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappnorv.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappnorv.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappnorv.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -25,7 +25,6 @@
 
 USERINCLUDE   	.
 USERINCLUDE   	../inc
-//SYSTEMINCLUDE	/epoc32/include/techview
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppanic.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppanic.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppanic.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -25,7 +25,6 @@
 
 USERINCLUDE   	.
 USERINCLUDE   	../inc
-//SYSTEMINCLUDE	/epoc32/include/techview
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppaniczero.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppaniczero.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppaniczero.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -25,7 +25,6 @@
 
 USERINCLUDE   	.
 USERINCLUDE   	../inc
-//SYSTEMINCLUDE	/epoc32/include/techview
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprvafterretry.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprvafterretry.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprvafterretry.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -26,7 +26,6 @@
 USERINCLUDE   	../inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
-//SYSTEMINCLUDE	/epoc32/include/techview
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY     euser.lib 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprverror.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprverror.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprverror.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -25,7 +25,6 @@
 
 USERINCLUDE   	.
 USERINCLUDE   	../inc
-//SYSTEMINCLUDE	/epoc32/include/techview
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappslow.mmp
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappslow.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappslow.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -28,7 +28,6 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
 MW_LAYER_SYSTEMINCLUDE
-//SYSTEMINCLUDE	/epoc32/include/techview
 
 LIBRARY     euser.lib 
 LIBRARY		apparc.lib 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappgood.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappgood.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappgood.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappnorv.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappnorv.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappnorv.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppanic.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppanic.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppanic.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppaniczero.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppaniczero.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppaniczero.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprvafterretry.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprvafterretry.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprvafterretry.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprverror.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprverror.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprverror.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappslow.rss
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappslow.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappslow.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstateplugins/test/testapps/group/gsatestappgood.mmp
--- a/sysstatemgmt/systemstateplugins/test/testapps/group/gsatestappgood.mmp	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/test/testapps/group/gsatestappgood.mmp	Wed Aug 18 11:03:14 2010 +0300
@@ -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"
@@ -28,7 +28,6 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE
-//SYSTEMINCLUDE	/epoc32/include/techview
 
 LIBRARY     euser.lib 
 LIBRARY		apparc.lib 
diff -r c6215323ad55 -r 072a9626b290 sysstatemgmt/systemstateplugins/test/testapps/src/gsatestappgood_reg.rss
--- a/sysstatemgmt/systemstateplugins/test/testapps/src/gsatestappgood_reg.rss	Tue Jul 06 15:43:30 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/test/testapps/src/gsatestappgood_reg.rss	Wed Aug 18 11:03:14 2010 +0300
@@ -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"