# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1283453306 -10800 # Node ID 09d657f1ee00226c8e9697954e99e77c0371b864 # Parent 072a9626b290abd29d592d71dd04785a1c419b95 Revision: 201035 Kit: 201035 diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/rom/accremcon.iby --- a/accessoryservices/accessoryremotecontrol/rom/accremcon.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/rom/accremcon.iby Thu Sep 02 21:48:26 2010 +0300 @@ -20,14 +20,14 @@ #ifndef ACCREMCON_IBY #define ACCREMCON_IBY -file=ABI_DIR\BUILD_DIR\RemConExtensionApi.dll SHARED_LIB_DIR\RemConExtensionApi.dll +file=ABI_DIR\BUILD_DIR\remconextensionapi.dll SHARED_LIB_DIR\RemConExtensionApi.dll -ECOM_PLUGIN( RemConKeyEventConverter.dll, RemConKeyEventConverter.rsc ) +ECOM_PLUGIN( remconkeyeventconverter.dll, remconkeyeventconverter.rsc ) #ifndef __PRODUCT_REMCON_TSP #ifndef RD_TSP_CLIENT_MAPPER -ECOM_PLUGIN( RemConTspController.dll, RemConTspController.rsc ) +ECOM_PLUGIN( remcontspcontroller.dll, remcontspcontroller.rsc ) #endif // RD_TSP_CLIENT_MAPPER #endif diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/EABI/dsytfstifadapterU.DEF --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/EABI/dsytfstifadapterU.DEF Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/EABI/dsytfstifadapterU.DEF Thu Sep 02 21:48:26 2010 +0300 @@ -1,3 +1,4 @@ EXPORTS _Z9LibEntryLv @ 1 NONAME + _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envrecall.cmd --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envrecall.cmd Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envrecall.cmd Thu Sep 02 21:48:26 2010 +0300 @@ -30,7 +30,12 @@ pushd \ncp_sw\corecom\modemadaptation_ext\adaptationlayer_ext\systemadaptation\accessoryadaptation\group\ REM call bldmake bldfiles REM call abld build remconadaptation -call sbs -p remconadaptation +if not "%1"=="" goto default +call sbs -p remconadaptation.mmp -c armv5.%1 +:default +call sbs -p remconadaptation.mmp -c armv5 +call sbs -p remconadaptation.mmp -c winscw +REM Add other variants if applicable popd @echo build remconadaptation... Finished diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envsetup.cmd --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envsetup.cmd Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/envsetup.cmd Thu Sep 02 21:48:26 2010 +0300 @@ -22,8 +22,12 @@ REM call bldmake bldfiles REM call abld makefile remconadaptation REM call abld reallyclean remconadaptation -call sbs -p remconadaptation -c armv5 REALLYCLEAN -call sbs -p remconadaptation -c winscw REALLYCLEAN +if not "%1"=="" goto default +call sbs -p remconadaptation.mmp -c armv5.%1 CLEAN +:default +call sbs -p remconadaptation.mmp -c armv5 CLEAN +call sbs -p remconadaptation.mmp -c winscw CLEAN +REM Add other variants if applicable popd @echo Cleaning remconadaptation... Finished diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/howto_use_test_setup_scripts.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/group/howto_use_test_setup_scripts.txt Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,11 @@ +The envsetup.cmd and envrecall.cmd scripts are by default meant for ARMV5 and WINSCW platforms only. +If the armv5 variant needs to be handled, the variant name should be passed as parameter to envsetup.cmd +and envrecall.cmd scripts. + +For example: +If testing only on winscw +use envsetup.cmd (to clean the production executables and setup stubs) +(and envrecall.cmd to revert to stub free state) + +If testing for platsim +use envsetup.cmd platsim79 (this would build for armv5.platsim79 apart from armv5 and winscw) diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/src/tfastifentrypoint.cpp --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/src/tfastifentrypoint.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dsytfstifadapter/src/tfastifentrypoint.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -159,4 +159,21 @@ COMPONENT_TRACE( ( _L( " DSYTESTTOOL - CTFAStifEntryPoint::CreateEnvironmentL - return 0x%x" ), env ) ); return env; } + + +EXPORT_C TInt SetRequirements( CTestModuleParam*& aTestModuleParam, + TUint32& aParameterValid ) + + { + aParameterValid = KStifTestModuleParameterChanged; + CTestModuleParamVer01* param = CTestModuleParamVer01::NewL(); + + // Stack size + param->iTestThreadStackSize= 65536; // 64KB stack + // Heap sizes + param->iTestThreadMinHeap = 4096; // 4K heap min + param->iTestThreadMaxHeap = 1260480;// 1.2M heap max + aTestModuleParam = param; + return KErrNone; + } diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/inc/remcontestcases.h --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/inc/remcontestcases.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/inc/remcontestcases.h Thu Sep 02 21:48:26 2010 +0300 @@ -89,7 +89,9 @@ { ETFRemCon_LaunchAudioClient, {}, 0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeUp, ERemConKeyModifierNone,ERemConKeyStateDown, ERemConKeyEventNone },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},0, (TText8*) L"", ETrue, ETFRemConEvent_VolumeUp}, - { ETFRemCon_CloseAudioClient, {}, 0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {}, 0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -98,10 +100,14 @@ const TRemConControlTestCaseState KVolumeUpReleaseShortStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeUp, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventShortPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},1, (TText8*) L"", ETrue, ETFRemConEvent_VolumeUp }, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -110,10 +116,14 @@ const TRemConControlTestCaseState KVolumeUpReleaseLongStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeUp, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventLongPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},1, (TText8*) L"", ETrue, ETFRemConEvent_VolumeUp }, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -122,10 +132,14 @@ const TRemConControlTestCaseState KVolumeDownPressStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeDown, ERemConKeyModifierNone,ERemConKeyStateDown, ERemConKeyEventNone },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},0, (TText8*) L"", ETrue, ETFRemConEvent_VolumeDown }, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -134,10 +148,14 @@ const TRemConControlTestCaseState KVolumeDownReleaseShortStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeDown, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventShortPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},1, (TText8*) L"", ETrue, ETFRemConEvent_VolumeDown }, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -146,7 +164,9 @@ const TRemConControlTestCaseState KVolumeDownReleaseLongStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeDown, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventLongPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},1, (TText8*) L"", ETrue, ETFRemConEvent_VolumeDown}, { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } @@ -161,7 +181,9 @@ { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_Subscribe, { ERemConKeyCodeVolumeDown, ERemConKeyModifierNone,ERemConKeyStateDown, ERemConKeyEventLongPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None}, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; @@ -173,10 +195,14 @@ const TRemConControlTestCaseState KMediaPlayAndPauseStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodePlayPause, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventShortPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},2, (TText8*) L"", ETrue, ETFRemConEvent_CoreApiPlaybackSpeedX1}, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -185,10 +211,14 @@ const TRemConControlTestCaseState KMediaStopStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeStop, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventShortPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},2, (TText8*) L"", ETrue, ETFRemConEvent_CodeStop }, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -197,10 +227,14 @@ const TRemConControlTestCaseState KMediaForwardPressStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeForward, ERemConKeyModifierNone,ERemConKeyStateDown, ERemConKeyEventRepeat },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},0, (TText8*) L"", ETrue, ETFRemConEvent_CodeForward}, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -209,10 +243,14 @@ const TRemConControlTestCaseState KMediaForwardReleaseStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeForward, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventLongPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},1, (TText8*) L"", ETrue, ETFRemConEvent_CodeForward}, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -221,10 +259,14 @@ const TRemConControlTestCaseState KMediaRewindPressStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeBack, ERemConKeyModifierNone,ERemConKeyStateDown, ERemConKeyEventRepeat },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},0, (TText8*) L"", ETrue, ETFRemConEvent_CodeBack}, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -233,10 +275,14 @@ const TRemConControlTestCaseState KMediaRewindReleaseStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeBack, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventLongPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},1, (TText8*) L"", ETrue, ETFRemConEvent_CodeBack}, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // @@ -245,10 +291,14 @@ const TRemConControlTestCaseState KMediaNextTrackStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeForward, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventShortPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},2, (TText8*) L"", ETrue, ETFRemConEvent_CodeForward }, - { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } + + /*{ ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }*/ + }; // // ACCREMCON [Media Previous Track Event] @@ -256,7 +306,9 @@ const TRemConControlTestCaseState KMediaPreviousTrackStates[] = { { ETFRemConEvent_NormalHandler, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, - { ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None }, + + /*{ ETFRemCon_LaunchAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None },*/ + { ETFRemCon_Subscribe, { ERemConKeyCodeBack, ERemConKeyModifierNone,ERemConKeyStateUp, ERemConKeyEventShortPress },0, (TText8*) L"", ETrue, ETFRemConEvent_None }, { ETFRemCon_CheckClientKey, {},2, (TText8*) L"", ETrue, ETFRemConEvent_CodeBack }, { ETFRemCon_CloseAudioClient, {},0, (TText8*) L"", ETrue, ETFRemConEvent_None } @@ -492,7 +544,9 @@ { ETFRemConEvent_CmdHandler, {},0, (TText8*) L"", EFalse, ETFRemConEvent_None }, { ETFRemConEvent_SetCallState, {}, EPSCTsyCallStateNone, (TText8*) L"", EFalse, ETFRemConEvent_None }, { ETFRemCon_Subscribe, {}, ERemConExtSpeedDial, (TText8*) L"1", EFalse, ETFRemConEvent_None }, - { ETFRemConEvent_CheckEvent, {}, 0,(TText8*) L"", EFalse, ETFRemConEvent_SpeedDial }, + + { ETFRemConEvent_CheckEvent, {}, 0,(TText8*) L"", EFalse, ETFRemConEvent_None }, + }; // diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/src/remconcore.cpp --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/src/remconcore.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/src/remconcore.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -262,9 +262,10 @@ void CRemConCore::Play() { TUint numRemotes; + + iActive->iStatus = KRequestPending; iCoreController->Play(iActive->iStatus, numRemotes, ERemConCoreApiButtonPress); - iActive->iStatus = KRequestPending; - iActive->SetActive(); + iActive->SetActive(); } // ----------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/src/remconsync.cpp --- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/src/remconsync.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/remcontestcontrolplugin/src/remconsync.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -110,9 +110,10 @@ // void CRemConSync::SynchronizeResponse() { - iSync->SynchronizeResponse(iActive->iStatus, iError); - iActive->iStatus = KRequestPending; - iActive->SetActive(); + iActive->iStatus = KRequestPending; + iSync->SynchronizeResponse(iActive->iStatus, iError); + iActive->SetActive(); + COMPONENT_TRACE( ( _L( "REMCONTESTCONTROL - SynchronizeResponse return" )) ); } void CRemConSync::GetCommandSourceInfo(TRemConExtCmdSource& aSource) diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audioclientstubremconobserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audioclientstubremconobserver.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,113 @@ +/* +* Copyright (c) 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: Implementation of observer class for remote control keys +* +*/ + + +// INCLUDE FILES +#include +#include +#include +#include +#include "audioclientstubremconobserver.h" +#include "accremconpstypes.h" + + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CAudioClientStubRemConObserver::CAudioClientStubRemConObserver +// C++ default constructor can NOT contain any code, that +// might leave. +// ----------------------------------------------------------------------------- +// +CAudioClientStubRemConObserver::CAudioClientStubRemConObserver( ) + : iInterfaceSelector( NULL ), + iCoreTarget( NULL ) + + { + // Nothing + } + +// ----------------------------------------------------------------------------- +// CAudioClientStubRemConObserver::ConstructL +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void CAudioClientStubRemConObserver::ConstructL() + { + RDebug::Print( _L("CAudioClientStubRemConObserver::ConstructL") ) ; + + iInterfaceSelector = CRemConInterfaceSelector::NewL(); + + iCoreTarget = CRemConCoreApiTarget::NewL( *iInterfaceSelector, *this ); + + iInterfaceSelector->OpenTargetL(); + } + +// ----------------------------------------------------------------------------- +// CAudioClientStubRemConObserver::NewL +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +CAudioClientStubRemConObserver* CAudioClientStubRemConObserver::NewL() + { + RDebug::Print( _L("CAudioClientStubRemConObserver::NewL") ) ; + + CAudioClientStubRemConObserver* self = new( ELeave ) CAudioClientStubRemConObserver(); + + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + + return self; + } + +// ----------------------------------------------------------------------------- +// CAudioClientStubRemConObserver::~CSysApRemConObserver +// Destructor +// ----------------------------------------------------------------------------- +// +CAudioClientStubRemConObserver::~CAudioClientStubRemConObserver() + { + RDebug::Print( _L("CAudioClientStubRemConObserver::~CAudioClientStubRemConObserver") ) ; + delete iInterfaceSelector; // Internally deletes iCoreTarget + } + +// ----------------------------------------------------------------------------- +// CAudioClientStubRemConObserver::MrccatoCommand +// Handles remote key event +// ----------------------------------------------------------------------------- +// +void CAudioClientStubRemConObserver::MrccatoCommand( TRemConCoreApiOperationId aOperationId, + TRemConCoreApiButtonAction aButtonAct ) + { + RDebug::Print( _L("CAudioClientStubRemConObserver::MrccatoCommand: aOperationId=%d, aButtonAct=%d"), aOperationId, aButtonAct ); + + TRemConClientKeyDataBuf keyDatabuf; + TRemConClientKeyData keyData; + keyData.iOperationId = aOperationId; + keyData.iButtonAct = aButtonAct; + keyDatabuf = keyData; + + TInt err = RProperty::Set( KTFRemConTestProperty, KTFRemConClientKey, keyDatabuf ); + + if ( err != KErrNone ) + { + RDebug::Print( _L("CAudioClientStubRemConObserver::MrccatoCommand: err=%d"), err ); + } + } + +// End of File diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audioclientstubremconobserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audioclientstubremconobserver.h Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,91 @@ +/* +* Copyright (c) 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: Observer class for remote control keys +* +*/ + + +#ifndef AUDIOCLIENTSTUBREMCONOBSERVER_H +#define AUDIOCLIENTSTUBREMCONOBSERVER_H + +// INCLUDES +#include + +// FORWARD DECLARATIONS +class CRemConInterfaceSelector; +class CRemConCoreApiTarget; + + +// CLASS DECLARATION + +/** +*/ +class CAudioClientStubRemConObserver : public CBase, public MRemConCoreApiTargetObserver + { + public: // Constructor and destructor + + /** + * Two-phased constructor. + */ + static CAudioClientStubRemConObserver* NewL(); + + /** + * Destructor. + */ + virtual ~CAudioClientStubRemConObserver(); + + protected: // Functions from base classes + + /** + * + * A command has been received. + * @param aOperationId The operation ID of the command. + * @param aButtonAct The button action associated with the command. + */ + void MrccatoCommand( TRemConCoreApiOperationId aOperationId, + TRemConCoreApiButtonAction aButtonAct); + + + private: // Functions + /** + * C++ default constructor. + * Not accessible. + */ + CAudioClientStubRemConObserver(); + + /** + * By default Symbian 2nd phase constructor is private. + */ + void ConstructL(); + + + private: // Data + + /** + * Remote Controller interface selector. + * Own. + */ + CRemConInterfaceSelector* iInterfaceSelector; + + /** + * Remote Controller target. + * Not own. + */ + CRemConCoreApiTarget* iCoreTarget; + + }; + +#endif // + +// End of File diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,39 @@ +/* +* Copyright (c) 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: Backend for the Qt app. Starts the Remcon observer. +* +*/ + +#include +#include "audiostuborbit.h" +#include "audioclientstubremconobserver.h" + +audiostuborbit::audiostuborbit(QWidget *parent) + : HbMainWindow(parent) +{ +// ui.setupUi(this); + iTspClientMapper = CTspClientMapper::NewL(); + iTspClientMapper->SetTspTargetClient( CTspClientMapper::EPlayingClients, RProcess().Id() ); + iRemConObserver = CAudioClientStubRemConObserver::NewL(); +} + +audiostuborbit::~audiostuborbit() +{ + if ( iTspClientMapper ) + { + iTspClientMapper->RemoveTspTargetClient( CTspClientMapper::EPlayingClients, RProcess().Id() ); + } + delete iTspClientMapper; + delete iRemConObserver; +} diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.h Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,39 @@ +/* +* Copyright (c) 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: Backend for the Qt app +* +*/ + +#ifndef AUDIOSTUBORBIT_H +#define AUDIOSTUBORBIT_H + +#include + +class CTspClientMapper; +class CAudioClientStubRemConObserver; + +class audiostuborbit : public HbMainWindow +{ + Q_OBJECT + +public: + audiostuborbit(QWidget *parent = 0); + ~audiostuborbit(); + +private: + CTspClientMapper* iTspClientMapper; + CAudioClientStubRemConObserver* iRemConObserver; +}; + +#endif // AUDIOSTUBORBIT_H diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,132 @@ +// ============================================================================== +// Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-07-19T09:07:14 +// This file is generated by qmake and should not be modified by the +// user. +// Name : audiostuborbit.mmp +// ============================================================================== + +TARGET audiostuborbit.exe +TARGETTYPE EXE + +UID 0x100039CE 0xE51D7B4B +SECUREID 0xE51D7B4B + +EPOCSTACKSIZE 0x14000 +EPOCHEAPSIZE 0x020000 0x800000 + +SOURCEPATH . +START RESOURCE audiostuborbit.rss +LANGUAGE_IDS +HEADER +TARGETPATH /resource/apps +END + +SOURCEPATH . +START RESOURCE audiostuborbit_reg.rss +DEPENDS audiostuborbit.rsg +TARGETPATH /private/10003a3f/import/apps +END + + +// Qt Macros +MACRO UNICODE +MACRO QT_KEYPAD_NAVIGATION +MACRO QT_SOFTKEYS_ENABLED +MACRO QT_USE_MATH_H_FLOATS +MACRO HB_HAVE_QT_MOBILITY +MACRO HB_HAVE_PROTECTED_CHUNK +MACRO HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS +MACRO HB_GESTURE_FW +MACRO HB_EFFECTS +MACRO HB_TEXT_MEASUREMENT_UTILITY +MACRO QT_SVG_LIB +MACRO QT_GUI_LIB +MACRO QT_NETWORK_LIB +MACRO QT_CORE_LIB + +SYSTEMINCLUDE /epoc32/include/mw/QtCore +SYSTEMINCLUDE /epoc32/include/mw/QtNetwork +SYSTEMINCLUDE /epoc32/include/mw/QtGui +SYSTEMINCLUDE /epoc32/include/mw/QtSvg +SYSTEMINCLUDE /epoc32/include/mw +SYSTEMINCLUDE ../../../../../../../mw/qt/mkspecs/common/symbian +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/stdapis +SYSTEMINCLUDE /epoc32/include/stdapis/sys +SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets +SYSTEMINCLUDE /epoc32/include/mw/hb/hbutils +SYSTEMINCLUDE /epoc32/include/stdapis/stlportv5 +SYSTEMINCLUDE /epoc32/include/platform/mw +SYSTEMINCLUDE /epoc32/include/platform +SYSTEMINCLUDE /epoc32/include/platform/loc +SYSTEMINCLUDE /epoc32/include/platform/mw/loc +SYSTEMINCLUDE /epoc32/include/platform/loc/sc +SYSTEMINCLUDE /epoc32/include/platform/mw/loc/sc +SYSTEMINCLUDE /epoc32/include/app +SYSTEMINCLUDE /epoc32/include/platform/app +SYSTEMINCLUDE /epoc32/include/platform/app/loc +SYSTEMINCLUDE /epoc32/include/platform/app/loc/sc +SYSTEMINCLUDE . + +SOURCEPATH . +SOURCE main.cpp +SOURCE audiostuborbit.cpp +SOURCE audioclientstubremconobserver.cpp +SOURCE moc_audiostuborbit.cpp + + +LIBRARY tspclientmapper.lib +LIBRARY remconcoreapi.lib +LIBRARY remconinterfacebase.lib +LIBRARY HbCore.lib +LIBRARY HbWidgets.lib +LIBRARY HbUtils.lib +LIBRARY libstdcppv5.lib +LIBRARY QtSvg.lib +LIBRARY QtGui.lib +LIBRARY QtNetwork.lib +LIBRARY QtCore.lib +LIBRARY libc.lib +LIBRARY libm.lib +LIBRARY euser.lib +LIBRARY libdl.lib +LIBRARY cone.lib +LIBRARY eikcore.lib +LIBRARY mediaclientaudio.lib +LIBRARY eikcoctl.lib +LIBRARY eiksrv.lib +LIBRARY apparc.lib +LIBRARY avkon.lib +LIBRARY efsrv.lib +LIBRARY charconv.lib +LIBRARY ws32.lib +LIBRARY hal.lib +LIBRARY gdi.lib +LIBRARY apgrfx.lib +STATICLIBRARY qtmain.lib + +CAPABILITY ALL -TCB + +OPTION CW -wchar_t on +OPTION ARMCC --visibility_inlines_hidden +#if defined(ARMCC_4_0) +OPTION ARMCC --import_all_vtbl +#endif +OPTION GCCE -fvisibility-inlines-hidden + +VERSION 10.0 + +ARMFPU softvfp + +PAGED + +BYTEPAIRCOMPRESSTARGET + +OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl + +USERINCLUDE . + +STDCPP + +USERINCLUDE . diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.pro Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,15 @@ +TEMPLATE = app +TARGET = audiostuborbit +CONFIG += hb +HEADERS += audiostuborbit.h \ + audioclientstubremconobserver.h +SOURCES += main.cpp \ + audiostuborbit.cpp \ + audioclientstubremconobserver.cpp + +# Libs +LIBS += -ltspclientmapper \ + -lremconcoreapi \ + -lremconinterfacebase + +symbian:TARGET.UID3 = 0xE51D7B4B diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.rss Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,21 @@ +// ============================================================================ +// * Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-07-19T09:07:14 +// * This file is generated by qmake and should not be modified by the +// * user. +// ============================================================================ + +#include +#include + +RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info + { + short_caption = STRING_r_short_caption; + caption_and_icon = + CAPTION_AND_ICON_INFO + { + caption = STRING_r_caption; + number_of_icons = 0; + icon_file = ""; + }; + } + diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_installer.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_installer.pkg Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,30 @@ +; audiostuborbit_installer.pkg generated by qmake at 2010-07-19T09:07:14 +; This file is generated by qmake and should not be modified by the user +; + +; Language +&EN + + +; SIS header: name, uid, version +#{"audiostuborbit installer"},(0xA000D7CE),1,0,0 + +; Localised Vendor name +%{"Vendor"} + +; Unique Vendor name +:"Vendor" + + +; Manual PKG pre-rules from PRO files +; Default dependency to Qt libraries +; Default HW/platform dependencies +[0x101F7961],0,0,0,{"S60ProductID"} +[0x102032BE],0,0,0,{"S60ProductID"} +[0x102752AE],0,0,0,{"S60ProductID"} +[0x1028315F],0,0,0,{"S60ProductID"} + + + +"Y:/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.sis" - "c:\adm\audiostuborbit.sis" +@"Y:/sf/mw/qt/smartinstaller.sis",(0x2002CCCD) diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_reg.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_reg.rss Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,18 @@ +// ============================================================================ +// * Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-07-19T09:07:14 +// * This file is generated by qmake and should not be modified by the +// * user. +// ============================================================================ + +#include +#include + +UID2 KUidAppRegistrationResourceFile +UID3 0xE51D7B4B + +RESOURCE APP_REGISTRATION_INFO + { + app_file="audiostuborbit"; + localisable_resource_file="\\resource\\apps\\audiostuborbit"; + + } diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_stub.pkg Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,27 @@ +; Y:/sf/app/audiostuborbit//audiostuborbit_stub.pkg generated by qmake at 2010-07-16T16:45:33 +; This file is generated by qmake and should not be modified by the user +; + +; Language +&EN + + +; SIS header: name, uid, version +#{"audiostuborbit"},(0xE51D7B4B),1,0,0 + +; Localised Vendor name +%{"Vendor"} + +; Unique Vendor name +:"Vendor" + + +; Manual PKG pre-rules from PRO files +; Default dependency to Qt libraries +; Default HW/platform dependencies + + +"" - "z:\sys\bin\audiostuborbit.exe" +"" - "z:\resource\apps\audiostuborbit.rsc" +"" - "z:\private\10003a3f\import\apps\audiostuborbit_reg.rsc" + diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_template.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit_template.pkg Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,34 @@ +; audiostuborbit_template.pkg generated by qmake at 2010-07-19T09:07:14 +; This file is generated by qmake and should not be modified by the user +; + +; Language +&EN + + +; SIS header: name, uid, version +#{"audiostuborbit"},(0xE51D7B4B),1,0,0 + +; Localised Vendor name +%{"Vendor"} + +; Unique Vendor name +:"Vendor" + + +; Manual PKG pre-rules from PRO files +; Default dependency to Qt libraries +(0x2001E61C), 4, 6, 3, {"Qt"} +; Default HW/platform dependencies +[0x101F7961],0,0,0,{"S60ProductID"} +[0x102032BE],0,0,0,{"S60ProductID"} +[0x102752AE],0,0,0,{"S60ProductID"} +[0x1028315F],0,0,0,{"S60ProductID"} + + +; Executable and default resource files +"/epoc32/release/$(PLATFORM)/$(TARGET)/audiostuborbit.exe" - "!:\sys\bin\audiostuborbit.exe" +"/epoc32/data/z/resource/apps/audiostuborbit.rsc" - "!:\resource\apps\audiostuborbit.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/audiostuborbit_reg.rsc" - "!:\private\10003a3f\import\apps\audiostuborbit_reg.rsc" + +; Manual PKG post-rules from PRO files diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,45 @@ +/* +* Copyright (c) 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: This file provides the information required for building the +* whole of a audioclientstub (Qt app). +* +*/ + +#define BLD_INF_AUDIOSTUBORBIT + + +prj_platforms + +WINSCW GCCE ARMV5 ARMV6 + + +prj_mmpfiles + +audiostuborbit.mmp + +prj_extensions + +START EXTENSION qt/qmake_extra_pre_targetdep.export +OPTION PREDEP_TARGET Y:/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/moc_audiostuborbit.cpp +OPTION DEPS Y:/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.h +OPTION COMMAND /epoc32/tools/moc.exe -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DHB_HAVE_QT_MOBILITY -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DQT_SVG_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I"Y:/epoc32/include/mw/QtCore" -I"Y:/epoc32/include/mw/QtNetwork" -I"Y:/epoc32/include/mw/QtGui" -I"Y:/epoc32/include/mw/QtSvg" -I"Y:/epoc32/include/mw" -I"Y:/sf/mw/qt/mkspecs/common/symbian" -I"Y:/epoc32/include" -I"Y:/epoc32/include/stdapis" -I"Y:/epoc32/include/stdapis/sys" -I"Y:/epoc32/include/mw/hb/hbcore" -I"Y:/epoc32/include/mw/hb/hbwidgets" -I"Y:/epoc32/include/mw/hb/hbutils" -I"Y:/epoc32/include/stdapis/stlportv5" -I"Y:/epoc32/include/platform/mw" -I"Y:/epoc32/include/platform" -I"Y:/epoc32/include/platform/loc" -I"Y:/epoc32/include/platform/mw/loc" -I"Y:/epoc32/include/platform/loc/sc" -I"Y:/epoc32/include/platform/mw/loc/sc" -I"Y:/epoc32/include/app" -I"Y:/epoc32/include/platform/app" -I"Y:/epoc32/include/platform/app/loc" -I"Y:/epoc32/include/platform/app/loc/sc" -I"Y:/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit" -DSYMBIAN y:/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/audiostuborbit.h -o y:/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/moc_audiostuborbit.cpp +END + +#if defined(WINSCW) +#endif + +START EXTENSION qt/qmake_store_build +END + + diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/main.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,31 @@ +/* +* Copyright (c) 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: Creates the Qt app and bring to foreground +* +*/ + +#include "audiostuborbit.h" + +#include + +int main(int argc, char *argv[]) +{ + HbApplication a(argc, argv); + a.setApplicationName("audiostuborbit"); + audiostuborbit *w = new audiostuborbit(); + w->show(); + int ret = a.exec(); + delete w; + return ret; +} diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/moc_audiostuborbit.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/audiostuborbit/moc_audiostuborbit.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,77 @@ +/* +* Copyright (c) 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: +* +*/ + +#include "audiostuborbit.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'audiostuborbit.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 62 +#error "This file was generated using the moc from 4.6.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_audiostuborbit[] = { + + // content: + 4, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_audiostuborbit[] = { + "audiostuborbit\0" +}; + +const QMetaObject audiostuborbit::staticMetaObject = { + { &HbMainWindow::staticMetaObject, qt_meta_stringdata_audiostuborbit, + qt_meta_data_audiostuborbit, 0 } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &audiostuborbit::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *audiostuborbit::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *audiostuborbit::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_audiostuborbit)) + return static_cast(const_cast< audiostuborbit*>(this)); + return HbMainWindow::qt_metacast(_clname); +} + +int audiostuborbit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = HbMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/group/bld.inf --- a/accessoryservices/accessoryremotecontrol/tsrc/stub/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/group/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -28,6 +28,7 @@ PRJ_TESTMMPFILES ../remcon/group/remconstub.mmp ../phone/group/phoneclient.mmp -../audio/group/audioclientstub.mmp +//../audio/group/audioclientstub.mmp +../audiostuborbit/audiostuborbit.mmp // End of file diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryremotecontrol/tsrc/stub/rom/remconteststub.iby --- a/accessoryservices/accessoryremotecontrol/tsrc/stub/rom/remconteststub.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryremotecontrol/tsrc/stub/rom/remconteststub.iby Thu Sep 02 21:48:26 2010 +0300 @@ -21,9 +21,13 @@ ECOM_PLUGIN(remconstub.dll, remconstub.rsc) -S60_APP_EXE(audioclientstub) -S60_APP_RESOURCE(audioclientstub) -S60_APP_AIF_RSC(audioclientstub) -data=DATAZ_\APP_RESOURCE_DIR\audioclientstub.mif APP_RESOURCE_DIR\audioclientstub.mif +//S60_APP_EXE(audioclientstub) +//S60_APP_RESOURCE(audioclientstub) +//S60_APP_AIF_RSC(audioclientstub) +//data=DATAZ_\APP_RESOURCE_DIR\audioclientstub.mif APP_RESOURCE_DIR\audioclientstub.mif + +file=ABI_DIR\UREL\audiostuborbit.exe \sys\bin\audiostuborbit.exe +data=DATAZ_\resource\apps\audiostuborbit.rsc resource\apps\audiostuborbit.rsc +data=DATAZ_\private\10003a3f\import\apps\audiostuborbit_reg.rsc private\10003a3f\import\apps\audiostuborbit_reg.rsc #endif //__REMCOMTESTSTUB_IBY__ diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Common/AccPolAccessoryPolicy.h --- a/accessoryservices/accessoryserver/inc/Common/AccPolAccessoryPolicy.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Common/AccPolAccessoryPolicy.h Thu Sep 02 21:48:26 2010 +0300 @@ -242,12 +242,12 @@ * Detect all subblock capabilities and append them to the given * array. */ - void ParseSubblocks( const TUint64& aVal, RArray& aCaps ); + void ParseSubblocksL( const TUint64& aVal, RArray& aCaps ); /** * Detect all subblock names and append them to the given array. */ - void ParseNames( const TUint32& aVal, RArray& aNames ); + void ParseNamesL( const TUint32& aVal, RArray& aNames ); /** * Find a bit number from bitmask. diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Server/AccSrvASYProxyHandler.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvASYProxyHandler.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvASYProxyHandler.h Thu Sep 02 21:48:26 2010 +0300 @@ -123,7 +123,7 @@ * @return Transaction ID assigned to this operation. * @see RemoveTransactionID */ - TInt StoreTransactionID( TProcessCmdId aCmdId, + TInt StoreTransactionIDL( TProcessCmdId aCmdId, TASYCommandParamRecord& aASYCommand, TPtr8* aPtrBuf ); diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h Thu Sep 02 21:48:26 2010 +0300 @@ -176,8 +176,7 @@ * @lib AccServer.lib * @since S60 3.1 */ -NONSHARABLE_CLASS( CAccSrvConnectionController ) : public CActive, - public MAccSrvConnectionControllerObserver +NONSHARABLE_CLASS( CAccSrvConnectionController ) : public MAccSrvConnectionControllerObserver { public :// Constructors and destructor @@ -341,12 +340,6 @@ void SetDefaultAccessoryInformation( const TAccPolGenericID& aGenericID, const TUint32 aDefaultValue); - /** - * From CActive - */ - void RunL(); - void DoCancel(); - protected: // New functions protected: // Functions from base classes @@ -391,19 +384,8 @@ TUint32 iInformationNoteUID; TUint32 iInformationNoteDefault; - // Indicates should accfw show notes about connected accessory. This is - // set to ETrue when accessory is connected and EFalse after note is shown. - // The reason for this is to prevent multiple notes one after another - TBool iShowNotes; CAccSrvWiredConnectionPublisher* iWiredConnPublisher; // Owned - // Ui notifier - RNotifier iNotifier; - - // Response data from notifier - TInt iReplyValue; - TPckg iReplyPck; - public: // Friend classes protected: // Friend classes diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Server/AccSrvConnectionHandler.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionHandler.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionHandler.h Thu Sep 02 21:48:26 2010 +0300 @@ -275,7 +275,7 @@ * During response handling name in question can be retrieved from here * according to the transaction Id with FindRequestData() method. */ - void StoreRequestData( TAccPolNameRecord aName, + void StoreRequestDataL( TAccPolNameRecord aName, TInt aTrId, TBool aUpdateConnectionNotification ); diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Server/AccSrvServerModel.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvServerModel.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvServerModel.h Thu Sep 02 21:48:26 2010 +0300 @@ -187,9 +187,9 @@ * * @since S60 3.1 * @param aGenericID Generic ID of the detected accessory. - * @return void + * @return index in the array */ - void RemovePhysicalConnection( const TAccPolGenericID& aGenericID ); + TInt RemovePhysicalConnection( const TAccPolGenericID& aGenericID ); /** * Get current connection status, ie. all active connections. @@ -390,7 +390,7 @@ * @param aThreadID ASYs thread ID to be stored. * @return void */ - void AddASYThreadId( TUint aThreadID ); + void AddASYThreadIdL( TUint aThreadID ); /** * Creates mapping between Generic ID and ASY. @@ -402,7 +402,7 @@ * @param aUniqueID Unique identifier of a Generic ID. * @return void */ - void StoreASYThreadID( TUint aThreadID, TInt aUniqueID ); + void StoreASYThreadIDL( TUint aThreadID, TInt aUniqueID ); /** * Removes mapping between Generic ID and ASY. @@ -439,7 +439,7 @@ * @return void * @see FindAndDeleteMsgThreadIDFilter() */ - void SetMsgThreadIDFilter( TUint aThreadID, TMsgID aMsgID ); + void SetMsgThreadIDFilterL( TUint aThreadID, TMsgID aMsgID ); /** * Find and delete a Thread Id/message filter. diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Server/AccSrvSettingsHandler.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvSettingsHandler.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvSettingsHandler.h Thu Sep 02 21:48:26 2010 +0300 @@ -236,7 +236,7 @@ /** * Returns all static keys for accessory mode. */ - void GetStaticKeys( const TAccMode aAccMode, + void GetStaticKeysL( const TAccMode aAccMode, RArray< TUint32 >& aArray ) const; public: // Data diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/inc/Server/AccSrvSubAudioControl.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvSubAudioControl.h Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvSubAudioControl.h Thu Sep 02 21:48:26 2010 +0300 @@ -112,24 +112,24 @@ private: // New functions /** - * Handles NotifyAccessoryAudioLinkOpened() client request. + * Handles NotifyAccessoryAudioLinkOpenedL() client request. * If leave occurs, the client request is completed with that error code. * * @since S60 3.1 * @param aMessage Client request. * @return void */ - void NotifyAccessoryAudioLinkOpened( const RMessage2& aMessage ); + void NotifyAccessoryAudioLinkOpenedL( const RMessage2& aMessage ); /** - * Handles NotifyAccessoryAudioLinkClosed() client request. + * Handles NotifyAccessoryAudioLinkClosedL() client request. * If leave occurs, the client request is completed with that error code. * * @since S60 3.1 * @param aMessage Client request. * @return void */ - void NotifyAccessoryAudioLinkClosed( const RMessage2& aMessage ); + void NotifyAccessoryAudioLinkClosedL( const RMessage2& aMessage ); /** * Handles AccessoryAudioLinkOpen() client request. @@ -182,7 +182,7 @@ void CancelAccessoryAudioLinkClose( const RMessage2& aMessage ); /** - * Handles NotifyAccessoryAudioLinkOpened() client request. + * Handles NotifyAccessoryAudioLinkOpenedL() client request. * If leave occurs, the client request is completed with that error code. * * @since S60 3.1 @@ -192,7 +192,7 @@ void CancelNotifyAccessoryAudioLinkOpened( const RMessage2& aMessage ); /** - * Handles NotifyAccessoryAudioLinkClosed() client request. + * Handles NotifyAccessoryAudioLinkClosedL() client request. * If leave occurs, the client request is completed with that error code. * * @since S60 3.1 @@ -213,10 +213,10 @@ //Stored AccessoryAudioLinkClose() client request for later completion. RMessage2 iAccessoryAudioLinkCloseMsg; - //Stored NotifyAccessoryAudioLinkOpened() client request for later completion. + //Stored NotifyAccessoryAudioLinkOpenedL() client request for later completion. RMessage2 iNotifyAccessoryAudioLinkOpenedMsg; - //Stored NotifyAccessoryAudioLinkClosed() client request for later completion. + //Stored NotifyAccessoryAudioLinkClosedL() client request for later completion. RMessage2 iNotifyAccessoryAudioLinkClosedMsg; //Thread id of the client-side caller for this subsession diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/rom/AccServer.iby --- a/accessoryservices/accessoryserver/rom/AccServer.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/rom/AccServer.iby Thu Sep 02 21:48:26 2010 +0300 @@ -21,20 +21,20 @@ #ifdef __ACCESSORY_FW -file=ABI_DIR\BUILD_DIR\AccAudioControl.dll SHARED_LIB_DIR\AccAudioControl.dll -file=ABI_DIR\BUILD_DIR\AccBTControl.dll SHARED_LIB_DIR\AccBTControl.dll -file=ABI_DIR\BUILD_DIR\AccClient.dll SHARED_LIB_DIR\AccClient.dll -file=ABI_DIR\BUILD_DIR\AccControl.dll SHARED_LIB_DIR\AccControl.dll -file=ABI_DIR\BUILD_DIR\AccPolicy.dll SHARED_LIB_DIR\AccPolicy.dll -file=ABI_DIR\BUILD_DIR\AccPolCom.dll SHARED_LIB_DIR\AccPolCom.dll -file=ABI_DIR\BUILD_DIR\AccPolicyDB.dll SHARED_LIB_DIR\AccPolicyDB.dll -file=ABI_DIR\BUILD_DIR\AccServer.exe PROGRAMS_DIR\AccServer.exe -file=ABI_DIR\BUILD_DIR\AsyComms.dll SHARED_LIB_DIR\AsyComms.dll -file=ABI_DIR\BUILD_DIR\AsyProxy.dll SHARED_LIB_DIR\AsyProxy.dll +file=ABI_DIR\BUILD_DIR\accaudiocontrol.dll SHARED_LIB_DIR\AccAudioControl.dll +file=ABI_DIR\BUILD_DIR\accbtcontrol.dll SHARED_LIB_DIR\AccBTControl.dll +file=ABI_DIR\BUILD_DIR\accclient.dll SHARED_LIB_DIR\AccClient.dll +file=ABI_DIR\BUILD_DIR\acccontrol.dll SHARED_LIB_DIR\AccControl.dll +file=ABI_DIR\BUILD_DIR\accpolicy.dll SHARED_LIB_DIR\AccPolicy.dll +file=ABI_DIR\BUILD_DIR\accpolcom.dll SHARED_LIB_DIR\AccPolCom.dll +file=ABI_DIR\BUILD_DIR\accpolicydb.dll SHARED_LIB_DIR\AccPolicyDB.dll +file=ABI_DIR\BUILD_DIR\accserver.exe PROGRAMS_DIR\AccServer.exe +file=ABI_DIR\BUILD_DIR\asycomms.dll SHARED_LIB_DIR\AsyComms.dll +file=ABI_DIR\BUILD_DIR\asyproxy.dll SHARED_LIB_DIR\AsyProxy.dll file=ABI_DIR\BUILD_DIR\accsrvutil.dll SHARED_LIB_DIR\accsrvutil.dll file=ABI_DIR\BUILD_DIR\accpolaudiodevicetopology.dll SHARED_LIB_DIR\accpolaudiodevicetopology.dll -data=ZPRIVATE\100012A5\policy\10205030.spd \private\100012A5\policy\10205030.spd +data=ZPRIVATE\100012a5\policy\10205030.spd \private\100012A5\policy\10205030.spd #endif // __ACCESSORY_FW diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/ASYProxy/ASYProxyAsyHandler.cpp --- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyAsyHandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyAsyHandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -30,7 +30,7 @@ // CONSTANTS const TInt KMinASYHeapSize = 0x2000; -const TInt KDefaultASYHeapSize = 0x4000; +const TInt KDefaultASYHeapSize = 0x8000; const TInt KMaxASYHeapSize = 0x8000; const TInt KMinASYStackSize = 0x1000; diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/ASYProxy/ASYProxyAsyLoader.cpp --- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyAsyLoader.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyAsyLoader.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -382,7 +382,7 @@ if ( found == EFalse ) { - onlyServicesIndexArray.Append( i ); + onlyServicesIndexArray.AppendL( i ); } } @@ -397,7 +397,7 @@ iServiceImplInfoArray.operator[]( onlyServicesIndexArray.operator[]( k ) ); iServiceImplInfoArray.Remove( onlyServicesIndexArray.operator[]( k ) ); - iServiceImplInfoArray.Append( implementationInformation ); + iServiceImplInfoArray.AppendL( implementationInformation ); } // Find Service / Handler pairs @@ -423,7 +423,7 @@ zeroUid.iUid = ZEROHANDLERUID; while ( iImplUidsHandlerArray.Count() < iServiceImplInfoArray.Count() ) { - iImplUidsHandlerArray.Append( zeroUid ); + iImplUidsHandlerArray.AppendL( zeroUid ); } User::RequestComplete( ptrStat, KErrNone ); diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsStack.cpp --- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsStack.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsStack.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -121,8 +121,10 @@ } CASYProxyTRRecord* asyProxyTRRecord = CASYProxyTRRecord::NewL( aASYProxyCommandObserver ); - iTRRecordArray.Append( asyProxyTRRecord ); - + CleanupStack::PushL ( asyProxyTRRecord ); + iTRRecordArray.AppendL( asyProxyTRRecord ); + CleanupStack::Pop(1); + aASYProxyCommandObserver->InitializeRef( asyProxyTRRecord ); aASYProxyCommandObserver->IssueRequestL(); diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/ConfigFileParser/AccConfigFileParser.cpp --- a/accessoryservices/accessoryserver/src/ConfigFileParser/AccConfigFileParser.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/ConfigFileParser/AccConfigFileParser.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -50,15 +50,15 @@ // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- -// CAccConfigFileParser::ParseSubblocks +// CAccConfigFileParser::ParseSubblocksL // Detecting subblocks and store them to destination array // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CAccConfigFileParser::ParseSubblocks( const TUint64& aVal, +void CAccConfigFileParser::ParseSubblocksL( const TUint64& aVal, RArray& aCaps ) { - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks()" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL()" ); TUint64 sum( 0 ); TUint64 curVal( 1 ); @@ -72,7 +72,7 @@ if ( ( curVal & aVal ) == curVal ) { COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::(Cap) MATCH! HI:0x%x LO:0x%x", I64HIGH( curVal ), I64LOW( curVal ) ); - aCaps.Append( curVal ); // Append to found caps array + aCaps.AppendL( curVal ); // Append to found caps array sum += curVal; } curBit++; @@ -80,32 +80,32 @@ } while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups ); - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks - return void" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL - return void" ); } // ----------------------------------------------------------------------------- -// CAccConfigFileParser::ParseNames +// CAccConfigFileParser::ParseNamesL // Detect all subblock names and append them to the gicen array. // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CAccConfigFileParser::ParseNames( const TUint32& aVal, +void CAccConfigFileParser::ParseNamesL( const TUint32& aVal, RArray& aNames ) { - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames()" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL()" ); TUint32 sum( 0 ); TUint32 curVal( 1 ); TInt curBit( 0 ); do { - COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames Binary for this roundtrip is 0x%x, total sum is 0x%x", curVal, sum ); - COM_TRACE_1( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames & 0x%x", curVal & aVal ); + COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL Binary for this roundtrip is 0x%x, total sum is 0x%x", curVal, sum ); + COM_TRACE_1( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL & 0x%x", curVal & aVal ); // Check if this subblock is defined in SB-def block if ( ( curVal & aVal ) == curVal ) { COM_TRACE_1( "[AccFW:SrvUtil] (Name) MATCH! 0x%x",curVal ); - aNames.Append( curVal ); // Append to found caps array + aNames.AppendL( curVal ); // Append to found caps array sum += curVal; } curBit++; @@ -113,7 +113,7 @@ } while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups ); - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames - return void" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL - return void" ); } // ----------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp --- a/accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -830,7 +830,7 @@ TAccPolGenericIDAccessor::SetFeatureAttributeL( genericID, KAccPolSBCapabilities, valU64 ); - ParseSubblocks( valU64, foundCapabilityGroups ); + ParseSubblocksL( valU64, foundCapabilityGroups ); //set "values" to point to firts value TLex8 values; @@ -882,7 +882,7 @@ TUint32 capabilityGroupValue(0); lVal.Val( capabilityGroupValue, EDecimal ); - ParseNames( capabilityGroupValue, foundCapability ); + ParseNamesL( capabilityGroupValue, foundCapability ); TInt capabilityIter(0); TInt foundCapabilityCount( foundCapability.Count() ); @@ -981,7 +981,7 @@ value, ( TAccPolValueType )type, ( TAccPolValueLocation )location ); - nameValueArray.Append( nameValueRecord ); + nameValueArray.AppendL( nameValueRecord ); } ++capabilityIter; } @@ -1015,14 +1015,14 @@ } // ----------------------------------------------------------------------------- -// CAccPolAccessoryPolicy::ParseSubblocks +// CAccPolAccessoryPolicy::ParseSubblocksL // Detecting subblocks and store them to destination array // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CAccPolAccessoryPolicy::ParseSubblocks( const TUint64& aVal, RArray& aCaps ) +void CAccPolAccessoryPolicy::ParseSubblocksL( const TUint64& aVal, RArray& aCaps ) { - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks()" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL()" ); TUint64 sum( 0 ); TUint64 curVal( 1 ); @@ -1036,7 +1036,7 @@ if ( ( curVal & aVal ) == curVal ) { COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::(Cap) MATCH! HI:0x%x LO:0x%x", I64HIGH( curVal ), I64LOW( curVal ) ); - aCaps.Append( curVal ); // Append to found caps array + aCaps.AppendL( curVal ); // Append to found caps array sum += curVal; } curBit++; @@ -1044,31 +1044,31 @@ } while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups ); - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks - return void" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL - return void" ); } // ----------------------------------------------------------------------------- -// CAccPolAccessoryPolicy::ParseNames +// CAccPolAccessoryPolicy::ParseNamesL // Detect all subblock names and append them to the gicen array. // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CAccPolAccessoryPolicy::ParseNames( const TUint32& aVal, RArray& aNames ) +void CAccPolAccessoryPolicy::ParseNamesL( const TUint32& aVal, RArray& aNames ) { - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames()" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL()" ); TUint32 sum( 0 ); TUint32 curVal( 1 ); TInt curBit( 0 ); do { - COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames Binary for this roundtrip is 0x%x, total sum is 0x%x", curVal, sum ); - COM_TRACE_1( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames & 0x%x", curVal & aVal ); + COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL Binary for this roundtrip is 0x%x, total sum is 0x%x", curVal, sum ); + COM_TRACE_1( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL & 0x%x", curVal & aVal ); // Check if this subblock is defined in SB-def block if ( ( curVal & aVal ) == curVal ) { COM_TRACE_1( "[AccFW:SrvUtil] (Name) MATCH! 0x%x",curVal ); - aNames.Append( curVal ); // Append to found caps array + aNames.AppendL( curVal ); // Append to found caps array sum += curVal; } curBit++; @@ -1076,7 +1076,7 @@ } while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups ); - COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames - return void" ); + COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL - return void" ); } // ----------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvASYProxyHandler.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvASYProxyHandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvASYProxyHandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -127,7 +127,7 @@ } else { - trID = StoreTransactionID( aCmdId, aASYCommand, aPtrBuf ); + trID = StoreTransactionIDL( aCmdId, aASYCommand, aPtrBuf ); } COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::HandleASYCommsL - return TrID=%d", trID ); @@ -135,22 +135,22 @@ } // ----------------------------------------------------------------------------- -// CAccSrvASYProxyHandler::StoreTransactionID +// CAccSrvASYProxyHandler::StoreTransactionIDL // ----------------------------------------------------------------------------- // -TInt CAccSrvASYProxyHandler::StoreTransactionID( +TInt CAccSrvASYProxyHandler::StoreTransactionIDL( TProcessCmdId aCmdId, TASYCommandParamRecord& aASYCommand, TPtr8* aPtrBuf ) { - COM_TRACE_( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID()" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL()" ); TInt trID( KErrNotFound ); TInt count( iOngoingTransactions.Count() ); TUint32 nameFromOngoingTransactions; TUint32 nameFromRequest; - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - current count = %d", count ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - current count = %d", count ); for ( TInt i( 0 ); i < count; ++i ) { @@ -163,7 +163,7 @@ { //Same command is under processing in ASY -> use existing trid trID = iOngoingTransactions.operator[](i).iTransactionID; - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - found trid = %d", trID ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - found trid = %d", trID ); break; } else @@ -180,7 +180,7 @@ trIDRecord.iNameRecord = aASYCommand.iNameRecord; trIDRecord.iCommand = aASYCommand.iCmdValue; trIDRecord.iTransactionID = trID; - iOngoingTransactions.Append( trIDRecord ); + iOngoingTransactions.AppendL( trIDRecord ); //Complete outstanding NotifyProcessCommand() TRAP_IGNORE( iConnectionController->NotificationQueue().CompleteASYCmdL( @@ -196,7 +196,7 @@ //This means also that ASY is not informed about this command. } - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - return %d", trID ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - return %d", trID ); return trID; } @@ -217,7 +217,7 @@ if ( iOngoingTransactions.operator[]( i ).iTransactionID == aTransactionID ) { iOngoingTransactions.Remove( i ); - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - removed index = %d",i ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - removed index = %d",i ); break; } else diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -40,8 +40,6 @@ // CONSTANTS -const TUid KAccFwUiNoteNotifierUid = { 0x10205061 }; - // MACROS // LOCAL CONSTANTS AND MACROS @@ -63,21 +61,16 @@ // ----------------------------------------------------------------------------- // CAccSrvConnectionController::CAccSrvConnectionController() - : CActive( EPriorityStandard ), - iPolicy( NULL ), + : iPolicy( NULL ), iServerModel( NULL ), iNotificationQueue( NULL ), iConnectionStatusHandler( NULL ), iModeHandler( NULL ), iASYProxyHandler( NULL ), - iShowNotes( EFalse ), - iWiredConnPublisher( NULL ), - iReplyPck( iReplyValue) + iWiredConnPublisher( NULL ) { COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::CAccSrvConnectionController()" ); - CActiveScheduler::Add( this );//Add the active object to the active scheduler - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::CAccSrvConnectionController - return" ); } @@ -166,12 +159,6 @@ // (used from handlers). iConnectionHandler.ResetAndDestroy(); - if ( iNotifier.Handle() ) - { - iNotifier.Close(); - } - Cancel(); - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::~CAccSrvConnectionController - return" ); } @@ -277,7 +264,7 @@ COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::HandleConnectL() New connection" ); // Store ThreadId for ASY handling - iServerModel->StoreASYThreadID( aCallerThreadID, aGenericID.UniqueID() ); + iServerModel->StoreASYThreadIDL( aCallerThreadID, aGenericID.UniqueID() ); iServerModel->AddPhysicalConnectionL( aGenericID ); @@ -711,14 +698,16 @@ { COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::PromoteToConnectedL()" ); - iServerModel->RemovePhysicalConnection( aGenericID ); //Move GID from physical connection array - iServerModel->AddConnectionL( aGenericID ); //to connection array + if( KErrNotFound != iServerModel->RemovePhysicalConnection( aGenericID )) //Move GID from physical connection array + { + iServerModel->AddConnectionL( aGenericID ); //to connection array - iNotificationQueue->CompleteControlMessageL( ENewAccessoryConnected, - KErrNone, - aGenericID.UniqueID() ); + iNotificationQueue->CompleteControlMessageL( ENewAccessoryConnected, + KErrNone, + aGenericID.UniqueID() ); - iConnectionStatusHandler->IssueRequest(); + iConnectionStatusHandler->IssueRequest(); + } COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::PromoteToConnectedL - return void" ); } @@ -817,8 +806,6 @@ KErrNotFound ); iSettingsHandler->ConnectionStatusChangedL( genericIDArray ); - // Able to show notes - iShowNotes = ETrue; iModeHandler->IssueRequest(); COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::HandleConnectionStatusChangedL - return void" ); @@ -884,96 +871,6 @@ KErrNone, KErrNotFound ); } - - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::HandleAccessoryModeChangedL - Show information note!" ); - - TBool showNote( EFalse ); - TInt noteValue( 0 ); - - switch ( accMode.iAccessoryMode ) - { - case EAccModeWiredHeadset: - case EAccModeWiredCarKit: - case EAccModeTextDevice: - case EAccModeLoopset: - case EAccModeMusicStand: - case EAccModeTVOut: - case EAccModeHeadphones: - { - TAccPolGenericID genericID; - iServerModel->GetLastConnectedAccessoryL( genericID ); - TUint32 num = genericID.SubblockCaps(); - if ( genericID.PhysicalConnectionCaps() != KPCHDMI ) // No info note for HDMI - { - if( num & KSBAudioSubblock ) - { - CCapValue* capValue = iServerModel->CapabilityStorage().GetCapability( genericID, KAccIntegratedAudioInput ); - if( iInformationNoteDefault ) - { - noteValue = iInformationNoteDefault; - showNote = ETrue; - } - if( !capValue && !iInformationNoteDefault ) - { - showNote = ETrue; - } - } - else - { - if( iInformationNoteDefault ) - { - noteValue = iInformationNoteDefault; - showNote = ETrue; - } - } - } - } - break; - default: - { - showNote = EFalse; - } - break; - } - - if ( showNote && iShowNotes ) - { - if( iServerModel->IdleDetected() ) - { - if ( iNotifier.Handle() ) - { - iNotifier.Close(); - } - if( IsActive() ) - { - Cancel(); - } - - //connect to notifier - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::HandleAccessoryModeChangedL - notifier.Connect" ); - TInt err = iNotifier.Connect(); - if(err != KErrNone) - { - //ok if cannot show note, this is possible during boot - COM_TRACE_1( "[AccFW:AccServer] CAccSrvConnectionController::HandleAccessoryModeChangedL - Couldn't connect to notifier: err = %d", err); - } - else - { - TPckg valuePckg( noteValue ); - iStatus = KRequestPending; - iNotifier.StartNotifierAndGetResponse( - iStatus, - KAccFwUiNoteNotifierUid, - valuePckg, - iReplyPck); - SetActive(); - } - } - //reset values - iShowNotes = EFalse; - iInformationNoteUID = 0; - iInformationNoteDefault = 0; - } } else { @@ -999,28 +896,6 @@ } // ----------------------------------------------------------------------------- -// CAccSrvConnectionController::RunL -// ----------------------------------------------------------------------------- -// -void CAccSrvConnectionController::RunL() - { - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::RunL()" ); - - iNotifier.Close(); - } - -// ----------------------------------------------------------------------------- -// CAccSrvConnectionController::DoCancel -// ----------------------------------------------------------------------------- -// -void CAccSrvConnectionController::DoCancel() - { - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::DoCancel()" ); - - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::DoCancel - return void" ); - } - -// ----------------------------------------------------------------------------- // CAccSrvConnectionController::RegisterControlMessageL // ----------------------------------------------------------------------------- // diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvConnectionHandler.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionHandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionHandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -148,7 +148,7 @@ //Stored request data is used when response is received from ASY //(i.e. HandleValueMessageL) - StoreRequestData( asyCommandParamRecord.iNameRecord, trId, ETrue ); + StoreRequestDataL( asyCommandParamRecord.iNameRecord, trId, ETrue ); //Store this object to queue to be able to receive response from ASY iCallback->RegisterControlMessageL( ESetValue, this ); @@ -598,30 +598,30 @@ //Stored request data is used when response is received from ASY //(i.e. HandleValueMessageL) - StoreRequestData( aASYCommandParam.iNameRecord, trId, EFalse ); + StoreRequestDataL( aASYCommandParam.iNameRecord, trId, EFalse ); //Store this object to queue to be able to receive response from ASY iCallback-> RegisterControlMessageL( EGetValue, this ); } // ----------------------------------------------------------------------------- -// CAccSrvConnectionHandler::StoreRequestData +// CAccSrvConnectionHandler::StoreRequestDataL // ----------------------------------------------------------------------------- // -void CAccSrvConnectionHandler::StoreRequestData( TAccPolNameRecord aName, +void CAccSrvConnectionHandler::StoreRequestDataL( TAccPolNameRecord aName, TInt aTrId, TBool aUpdateConnectionNotification ) { - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionHandler::StoreRequestData()" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionHandler::StoreRequestDataL()" ); TAccSrvRequestData requestData; requestData.iName = aName; requestData.iTrId = aTrId; requestData.iUpdateNotification = aUpdateConnectionNotification; - iRequestDataArray.Append( requestData ); + iRequestDataArray.AppendL( requestData ); - COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionHandler::StoreRequestData - return void" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionHandler::StoreRequestDataL - return void" ); } // ----------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -316,7 +316,7 @@ // CAccSrvServerModel::RemovePhysicalConnectionL // ----------------------------------------------------------------------------- // -void CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID ) +TInt CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID ) { COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection()" ); @@ -329,7 +329,9 @@ iPhysicalConnectionArray.Remove( index ); } - COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return void" ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return %d", index ); + + return index; } // ----------------------------------------------------------------------------- @@ -754,17 +756,17 @@ } // ----------------------------------------------------------------------------- -// CAccSrvServerModel::AddASYThreadId +// CAccSrvServerModel::AddASYThreadIdL // ----------------------------------------------------------------------------- // -void CAccSrvServerModel::AddASYThreadId( TUint aThreadID ) +void CAccSrvServerModel::AddASYThreadIdL( TUint aThreadID ) { - COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::AddASYThreadId(%d)", aThreadID ); - iRegisteredASYs.Append( aThreadID ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::AddASYThreadIdL(%d)", aThreadID ); + iRegisteredASYs.AppendL( aThreadID ); } // ----------------------------------------------------------------------------- -// CAccSrvServerModel::StoreASYThreadID +// CAccSrvServerModel::StoreASYThreadIDL // // If aThreadID can be found from connected ASYs table (iRegisteredASYs), // mapping between aUniqueID and aThreadID can be made. @@ -772,17 +774,17 @@ // all request for that gineric ID. // ----------------------------------------------------------------------------- // -void CAccSrvServerModel::StoreASYThreadID( TUint aThreadID, TInt aUniqueID ) +void CAccSrvServerModel::StoreASYThreadIDL( TUint aThreadID, TInt aUniqueID ) { - COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadID(%d %d)", aThreadID, aUniqueID ); + COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadIDL(%d %d)", aThreadID, aUniqueID ); if ( KErrNotFound == iRegisteredASYs.Find( aThreadID ) ) { - COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadID - Thread ID is not ASYs" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadIDL - Thread ID is not ASYs" ); } else { - iASYThreadID.Append( aThreadID ); - iASYUniqueID.Append( aUniqueID ); + iASYThreadID.AppendL( aThreadID ); + iASYUniqueID.AppendL( aUniqueID ); } } @@ -795,7 +797,7 @@ COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::RemoveASYThreadID(%d)", aUniqueID ); TInt index( iASYUniqueID.Find( aUniqueID ) ); - //If index is KErrNotFound, threadIDs are never stored in CAccSrvServerModel::StoreASYThreadID() + //If index is KErrNotFound, threadIDs are never stored in CAccSrvServerModel::StoreASYThreadIDL() if ( KErrNotFound != index ) { iASYThreadID.Remove( index ); @@ -833,20 +835,20 @@ } // ----------------------------------------------------------------------------- -// CAccSrvServerModel::SetMsgThreadIDFilter +// CAccSrvServerModel::SetMsgThreadIDFilterL // ----------------------------------------------------------------------------- // -void CAccSrvServerModel::SetMsgThreadIDFilter( TUint aThreadID, TMsgID aMsgID ) +void CAccSrvServerModel::SetMsgThreadIDFilterL( TUint aThreadID, TMsgID aMsgID ) { - COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilter(%d %d)", aThreadID, aMsgID ); + COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilterL(%d %d)", aThreadID, aMsgID ); TAccSrvThreadIDFilter threadIDFilter; threadIDFilter.iThreadID = aThreadID; threadIDFilter.iMsgID = aMsgID; - iThreadIDFilterArray.Append( threadIDFilter ); + iThreadIDFilterArray.AppendL( threadIDFilter ); - COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilter - count=%d - return void", iThreadIDFilterArray.Count() ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilterL - count=%d - return void", iThreadIDFilterArray.Count() ); } // ----------------------------------------------------------------------------- @@ -898,7 +900,7 @@ else { COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - handling index %d", index ); - iCancelledConnectAccessory.Append( genericIDArray.GetGenericIDL( index ).UniqueID() ); + iCancelledConnectAccessory.AppendL( genericIDArray.GetGenericIDL( index ).UniqueID() ); } COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - return void" ); @@ -929,7 +931,7 @@ else { COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - handling index %d", index ); - iCancelledConnectAccessory.Append( genericIDArray.GetGenericIDL( index ).UniqueID() ); + iCancelledConnectAccessory.AppendL( genericIDArray.GetGenericIDL( index ).UniqueID() ); } COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - DeviceAddress - return void" ); diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvSettingsHandler.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvSettingsHandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvSettingsHandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -551,7 +551,7 @@ RArray< TUint32 > array; CleanupClosePushL( array ); - GetStaticKeys( aAccMode, array ); + GetStaticKeysL( aAccMode, array ); TAccModeSetting setting; // get mode related static settings for client @@ -997,45 +997,45 @@ } // ----------------------------------------------------------------------------- -// CAccSrvSettingsHandler::GetStaticKeys +// CAccSrvSettingsHandler::GetStaticKeysL // // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CAccSrvSettingsHandler::GetStaticKeys( +void CAccSrvSettingsHandler::GetStaticKeysL( const TAccMode aAccMode, RArray< TUint32 >& aArray ) const { - COM_TRACE_1( "[AccFW:AccServer] CAccSrvSettingsHandler::GetStaticKeys(%d)", aAccMode ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvSettingsHandler::GetStaticKeysL(%d)", aAccMode ); switch( aAccMode ) { case EAccModeWiredHeadset: - aArray.Append( KAccServerWiredHSLights ); + aArray.AppendL( KAccServerWiredHSLights ); break; case EAccModeWirelessHeadset: - aArray.Append( KAccServerWirelessHSLights ); + aArray.AppendL( KAccServerWirelessHSLights ); break; case EAccModeWiredCarKit: - aArray.Append( KAccServerWiredCarKitLights ); + aArray.AppendL( KAccServerWiredCarKitLights ); break; case EAccModeWirelessCarKit: - aArray.Append( KAccServerWirelessCarKitLights ); + aArray.AppendL( KAccServerWirelessCarKitLights ); break; case EAccModeTextDevice: - aArray.Append( KAccServerTextDeviceLights ); + aArray.AppendL( KAccServerTextDeviceLights ); break; case EAccModeLoopset: - aArray.Append( KAccServerLoopsetLights ); + aArray.AppendL( KAccServerLoopsetLights ); break; case EAccModeMusicStand: - aArray.Append( KAccServerMusicStandLights ); + aArray.AppendL( KAccServerMusicStandLights ); break; default: // mode is not supported break; } - COM_TRACE_( "[AccFW:AccServer] CAccSrvSettingsHandler::GetStaticKeys() returns" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvSettingsHandler::GetStaticKeysL() returns" ); } // ========================== OTHER EXPORTED FUNCTIONS ========================= diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvSubAsyComms.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvSubAsyComms.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvSubAsyComms.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -82,7 +82,7 @@ COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAsyComms::ConstructL()" ); iInitCommandTimer = CAccSrvProcessCommandTimer::NewL( this, KInitCmdTimeOut ); - iServerModel->AddASYThreadId( iASYThreadID ); + iServerModel->AddASYThreadIdL( iASYThreadID ); COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAsyComms::ConstructL - return void" ); } diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvSubAudioControl.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvSubAudioControl.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvSubAudioControl.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -121,12 +121,12 @@ } // ----------------------------------------------------------------------------- -// CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpened +// CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpenedL // ----------------------------------------------------------------------------- // -void CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpened( const RMessage2& aMessage ) +void CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpenedL( const RMessage2& aMessage ) { - COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpened()" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpenedL()" ); iConnectionController->NotificationQueue().RegisterControlMessage( EAccessoryAudioLinkOpened, this ); @@ -136,24 +136,24 @@ // If message is null, there is no pending request and no filtering needed if ( !iAccessoryAudioLinkOpenMsg.IsNull() ) { - //NotifyAccessoryAudioLinkOpened() notification is filtered + //NotifyAccessoryAudioLinkOpenedL() notification is filtered //for AccessoryAudioLinkOpen() caller thread. - //In this case NotifyAccessoryAudioLinkOpened() notification + //In this case NotifyAccessoryAudioLinkOpenedL() notification //is ordered after AccessoryAudioLinkOpen() is sent. - iConnectionController->ServerModel().SetMsgThreadIDFilter( iCallerThreadID, + iConnectionController->ServerModel().SetMsgThreadIDFilterL( iCallerThreadID, EAccessoryAudioLinkOpened ); } - COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpened - return void" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkOpenedL - return void" ); } // ----------------------------------------------------------------------------- -// CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosed +// CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosedL // ----------------------------------------------------------------------------- // -void CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosed( const RMessage2& aMessage ) +void CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosedL( const RMessage2& aMessage ) { - COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosed()" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosedL()" ); iConnectionController->NotificationQueue().RegisterControlMessage( EAccessoryAudioLinkClosed, this ); @@ -162,15 +162,15 @@ // If message is null, there is no pending request and no filtering needed if ( !iAccessoryAudioLinkCloseMsg.IsNull() ) { - //NotifyAccessoryAudioLinkClosed() notification is filtered + //NotifyAccessoryAudioLinkClosedL() notification is filtered //for AccessoryAudioLinkClose() caller thread. - //In this case NotifyAccessoryAudioLinkClosed() notification + //In this case NotifyAccessoryAudioLinkClosedL() notification //is ordered after AccessoryAudioLinkClose() is sent. - iConnectionController->ServerModel().SetMsgThreadIDFilter( iCallerThreadID, + iConnectionController->ServerModel().SetMsgThreadIDFilterL( iCallerThreadID, EAccessoryAudioLinkClosed ); } - COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosed - return void" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvSubAudioControl::NotifyAccessoryAudioLinkClosedL - return void" ); } // ----------------------------------------------------------------------------- @@ -219,9 +219,9 @@ // If message is null, there is no pending request and no filtering needed if ( !iNotifyAccessoryAudioLinkOpenedMsg.IsNull() ) { - //NotifyAccessoryAudioLinkOpened notification() is filtered + //NotifyAccessoryAudioLinkOpenedL notification() is filtered //for AccessoryAudioLinkOpen() caller thread - iConnectionController->ServerModel().SetMsgThreadIDFilter( iCallerThreadID, + iConnectionController->ServerModel().SetMsgThreadIDFilterL( iCallerThreadID, EAccessoryAudioLinkOpened ); } @@ -263,9 +263,9 @@ // If message is null, there is no pending request and no filtering needed if ( !iNotifyAccessoryAudioLinkClosedMsg.IsNull() ) { - //NotifyAccessoryAudioLinkClosed() notification is filtered + //NotifyAccessoryAudioLinkClosedL() notification is filtered //for AccessoryAudioLinkClose() caller thread - iConnectionController->ServerModel().SetMsgThreadIDFilter( + iConnectionController->ServerModel().SetMsgThreadIDFilterL( iCallerThreadID, EAccessoryAudioLinkClosed ); } @@ -311,7 +311,7 @@ this ); //AccessoryAudioLinkOpen() request is cancelled - //-> NO filtering needed for NotifyAccessoryAudioLinkOpened() + //-> NO filtering needed for NotifyAccessoryAudioLinkOpenedL() iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, EAccessoryAudioLinkOpened ); @@ -340,7 +340,7 @@ this ); //AccessoryAudioLinkClose() request is cancelled - //-> NO filtering needed for NotifyAccessoryAudioLinkClosed() + //-> NO filtering needed for NotifyAccessoryAudioLinkClosedL() iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, EAccessoryAudioLinkClosed ); @@ -367,7 +367,7 @@ iConnectionController->NotificationQueue().CancelControlMessage( EAccessoryAudioLinkOpened, this ); - //NotifyAccessoryAudioLinkOpened() notification order is cancelled + //NotifyAccessoryAudioLinkOpenedL() notification order is cancelled //-> NO filtering needed for that message iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, EAccessoryAudioLinkOpened ); @@ -394,7 +394,7 @@ iConnectionController->NotificationQueue().CancelControlMessage( EAccessoryAudioLinkClosed, this ); - //NotifyAccessoryAudioLinkClosed() notification order is cancelled + //NotifyAccessoryAudioLinkClosedL() notification order is cancelled //-> NO filtering needed for that message iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, EAccessoryAudioLinkClosed ); @@ -422,12 +422,12 @@ { case EAccSrvNotifyAccessoryAudioLinkOpened: { - NotifyAccessoryAudioLinkOpened( aMessage ); + NotifyAccessoryAudioLinkOpenedL( aMessage ); break; } case EAccSrvNotifyAccessoryAudioLinkClosed: { - NotifyAccessoryAudioLinkClosed( aMessage ); + NotifyAccessoryAudioLinkClosedL( aMessage ); break; } case EAccSrvAccessoryAudioLinkOpen: @@ -494,7 +494,7 @@ { if( KErrNone != aErrorCode ) { - //Release NotifyAccessoryAudioLinkOpened() filtering in error case. + //Release NotifyAccessoryAudioLinkOpenedL() filtering in error case. //BluetoothAudioLinkOpenedNotify() message is never sent in error case iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, @@ -511,7 +511,7 @@ { if( KErrNone != aErrorCode ) { - //Release NotifyAccessoryAudioLinkClosed() filtering in error case. + //Release NotifyAccessoryAudioLinkClosedL() filtering in error case. //BluetoothAudioLinkClosedNotify() message is never sent in error case iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, @@ -526,13 +526,13 @@ case EAccessoryAudioLinkOpened: { - // Nothing is done here if filter is set, i.e. NotifyAccessoryAudioLinkOpened() + // Nothing is done here if filter is set, i.e. NotifyAccessoryAudioLinkOpenedL() // notification was ordered from the same thread that AccessoryAudioLinkOpen() was called if ( !iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, EAccessoryAudioLinkOpened ) ) { - //Complete outstanding NotifyAccessoryAudioLinkOpened request + //Complete outstanding NotifyAccessoryAudioLinkOpenedL request //Notice, This works for single client (Server model can store only one value) TAccAudioType audioType( iConnectionController->ServerModel().AudioType() ); TAccPolGenericID genericID; @@ -555,13 +555,13 @@ case EAccessoryAudioLinkClosed: { - // Nothing is done here if filter is set, i.e. NotifyAccessoryAudioLinkClosed() + // Nothing is done here if filter is set, i.e. NotifyAccessoryAudioLinkClosedL() // notification was ordered from the same thread that AccessoryAudioLinkClose() was called if ( !iConnectionController->ServerModel().FindAndDeleteMsgThreadIDFilter( iCallerThreadID, EAccessoryAudioLinkClosed ) ) { - //Complete outstanding NotifyAccessoryAudioLinkClosed request + //Complete outstanding NotifyAccessoryAudioLinkClosedL request //Notice, This works for single client (Server model can store only one value) TAccAudioType audioType( iConnectionController->ServerModel().AudioType() ); TAccPolGenericID genericID; diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/src/Server/AccSrvSubControl.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvSubControl.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvSubControl.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -235,12 +235,18 @@ } else { - err = notifier.StartNotifier( KAccFwUiNoteNotifierUid, KNullDesC8 ); - if ( err != KErrNone ) - { - COM_TRACE_1( "[AccFW:AccServer] CAccSrvSubControl::ConnectAccessoryL - Couldn't start notifier: err = %d", err); - } - notifier.Close(); + TPckgiReplyPck(0); + TRequestStatus iStatus =KRequestPending; + notifier.StartNotifierAndGetResponse(iStatus, + KAccFwUiNoteNotifierUid, + KNullDesC8,iReplyPck); + User::WaitForRequest(iStatus); + err = iStatus.Int(); + if(KErrNone != err) + { + COM_TRACE_1( "[AccFW:AccServer] CAccSrvSubControl::ConnectAccessoryL - Couldn't start notifier: err = %d", err); + } + notifier.Close(); } } else diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/AccessoryTestControlPlugin/src/TfAccessoryTestControlPlugin.cpp --- a/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/AccessoryTestControlPlugin/src/TfAccessoryTestControlPlugin.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/AccessoryTestControlPlugin/src/TfAccessoryTestControlPlugin.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -3141,8 +3141,7 @@ { TF_INIT_TEST_SUITE_FUNCTION( aSuite ); - TF_ADD_TEST_CASE_L( 11201, _L( "[M11201] [[AccServer] Connect USB headset] ")); - TF_ADD_TEST_CASE_L( 11202, _L( "[M11202] [[AccServer] Get and Set USB headset audio streams format parameter] ")); + TF_ADD_TEST_CASE_L( 11203, _L( "[M11203] [[AccServer] Get USB audio units (Audio Topology) ] ")); TF_ADD_TEST_CASE_L( 11204, _L( "[M11204] [[AccServer] Set/Get volume control] ")); TF_ADD_TEST_CASE_L( 11205, _L( "[M11205] [[AccServer] Set/Get mute control] ")); @@ -3150,6 +3149,8 @@ TF_ADD_TEST_CASE_L( 11207, _L( "[M11207] [[AccServer] Cancel accessory object value changed notify]")); TF_ADD_TEST_CASE_L( 11208, _L( "[M11208] [[AccServer] Accessory object value changed notify]")); TF_ADD_TEST_CASE_L( 11209, _L( "[M11209] [[AccServer] Accessory object value changed notify and cancel]")); + TF_ADD_TEST_CASE_L( 11201, _L( "[M11201] [[AccServer] Connect USB headset] ")); + TF_ADD_TEST_CASE_L( 11202, _L( "[M11202] [[AccServer] Get and Set USB headset audio streams format parameter] ")); } static void HdmiObjectModuleTestSuiteL( CTFATestSuite* aSuite ) diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envrecall.cmd --- a/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envrecall.cmd Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envrecall.cmd Thu Sep 02 21:48:26 2010 +0300 @@ -55,7 +55,7 @@ call sbs -c armv5 EXPORT call sbs -c winscw EXPORT REM call abld build accessoryadaptation -call sbs -p accessoryadaptation +call sbs -p accessoryadaptation.mmp popd @echo build accessoryadaptation... Finished diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envsetup.cmd --- a/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envsetup.cmd Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/accessoryserver/tsrc/public/basic/AccessoryTestControl/dsytfstifadapter/group/envsetup.cmd Thu Sep 02 21:48:26 2010 +0300 @@ -22,8 +22,8 @@ REM call bldmake bldfiles REM call abld makefile btaudiomanclient REM call abld reallyclean btaudiomanclient -call sbs -p btaudiomanclient -c armv5 REALLYCLEAN -call sbs -p btaudiomanclient -c winscw REALLYCLEAN +call sbs -p btaudiomanclient.mmp -c armv5 CLEAN +call sbs -p btaudiomanclient.mmp -c winscw CLEAN popd @echo Cleaning BT Audioman Client... Finished @@ -33,8 +33,8 @@ REM call bldmake bldfiles REM call abld makefile REM call abld reallyclean -call sbs -c armv5 REALLYCLEAN -call sbs -c winscw REALLYCLEAN +call sbs -c armv5 CLEAN +call sbs -c winscw CLEAN popd @echo Cleaning accfwuinotifier... Finished @@ -44,8 +44,8 @@ REM call bldmake bldfiles REM call abld makefile accessoryadaptation REM call abld clean accessoryadaptation -call sbs -p accessoryadaptation -c armv5 CLEAN -call sbs -p accessoryadaptation -c winscw CLEAN +call sbs -p accessoryadaptation.mmp -c armv5 CLEAN +call sbs -p accessoryadaptation.mmp -c winscw CLEAN popd @echo Cleaning accessoryadaptation... Finished @@ -54,8 +54,8 @@ pushd \sf\os\devicesrv\accessoryservices\pluggeddisplay\pluggeddisplayasy\group REM call bldmake bldfiles REM call abld reallyclean -call sbs -c armv5 REALLYCLEAN -call sbs -c winscw REALLYCLEAN +call sbs -c armv5 CLEAN +call sbs -c winscw CLEAN popd @echo Cleaning Plugged Display ASY... Finished diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -193,7 +193,7 @@ { hdmiSink = CAccPolHdmiSink::NewL( iExtensionParserPtr->BasicAudio(), - iTVOutConfigForHDMI.GetTvOutConfig()->CopyProtectionStatus() ); + ETrue ); } else { diff -r 072a9626b290 -r 09d657f1ee00 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -829,13 +829,13 @@ { INFO( "Event: EIfAsyCommandHandlerEventSetCopyProtectionOn" ); TInt retVal = iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtection( ETrue ); - iHDMICableStatusFSM.CopyProtectionSettingDone( retVal ); + iHDMICableStatusFSM.CopyProtectionSettingDone( retVal, iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtectionStatus() ); } else if ( EIfAsyCommandHandlerEventSetCopyProtectionOff == aEvent ) { INFO( "Event: EIfAsyCommandHandlerEventSetCopyProtectionOff" ); TInt retVal = iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtection( EFalse ); - iHDMICableStatusFSM.CopyProtectionSettingDone( retVal ); + iHDMICableStatusFSM.CopyProtectionSettingDone( retVal, iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtectionStatus() ); } else if ( EIfAsyCommandHandlerEventGetCopyProtectStatus == aEvent ) { diff -r 072a9626b290 -r 09d657f1ee00 commonservices/PlatformEnv/rom/PlatformEnv.iby --- a/commonservices/PlatformEnv/rom/PlatformEnv.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/PlatformEnv/rom/PlatformEnv.iby Thu Sep 02 21:48:26 2010 +0300 @@ -19,14 +19,14 @@ #ifndef __PLATFORMENV_IBY__ #define __PLATFORMENV_IBY__ -file=ABI_DIR\BUILD_DIR\PlatformEnv.dll SHARED_LIB_DIR\PlatformEnv.dll +file=ABI_DIR\BUILD_DIR\platformenv.dll SHARED_LIB_DIR\platformenv.dll #ifdef FF_USE_MASS_STORAGE_CONFIG -patchdata PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE -patchdata PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1 +patchdata platformenv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE +patchdata platformenv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1 #endif // FF_USE_MASS_STORAGE_CONFIG -patchdata PlatformEnv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START +patchdata platformenv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START file=ABI_DIR\BUILD_DIR\disknotifyhandler.dll SHARED_LIB_DIR\disknotifyhandler.dll file=ABI_DIR\BUILD_DIR\sysversioninfo.dll SHARED_LIB_DIR\sysversioninfo.dll diff -r 072a9626b290 -r 09d657f1ee00 commonservices/commonengine/conf/ci_commonengine.confml Binary file commonservices/commonengine/conf/ci_commonengine.confml has changed diff -r 072a9626b290 -r 09d657f1ee00 commonservices/commonengine/conf/commonengine.confml Binary file commonservices/commonengine/conf/commonengine.confml has changed diff -r 072a9626b290 -r 09d657f1ee00 commonservices/commonengine/config/export.mk --- a/commonservices/commonengine/config/export.mk Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/commonengine/config/export.mk Thu Sep 02 21:48:26 2010 +0300 @@ -21,6 +21,7 @@ $(call push,MAKEFILE_STACK,$(MAKEFILE)) CONFFILES = $(MAKEFILEDIR)../conf/commonengine.confml $(EPOCROOT)/epoc32/rom/config/confml_data/s60/ \ + $(MAKEFILEDIR)../conf/ci_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 diff -r 072a9626b290 -r 09d657f1ee00 commonservices/commonengine/group/bld.inf --- a/commonservices/commonengine/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/commonengine/group/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2007 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" @@ -23,6 +23,7 @@ PRJ_EXPORTS //Configuration tool migration ../conf/commonengine.confml OS_LAYER_CONFML(commonengine.confml) +../conf/ci_commonengine.confml OS_LAYER_CONFML(ci_commonengine.confml) ../conf/commonengine_1020503B.crml OS_LAYER_CRML(commonengine_1020503B.crml) ../rom/diskspacereserver.iby CORE_OS_LAYER_IBY_EXPORT_PATH(diskspacereserver.iby) diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/data/lang_test.txt Binary file commonservices/sysutil/test/data/lang_test.txt has changed diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/data/langsw_test.txt Binary file commonservices/sysutil/test/data/langsw_test.txt has changed diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/data/purpose_test.txt Binary file commonservices/sysutil/test/data/purpose_test.txt has changed diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/data/sw_test.txt Binary file commonservices/sysutil/test/data/sw_test.txt has changed diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/data/te_sysutildata.ini --- a/commonservices/sysutil/test/data/te_sysutildata.ini Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/data/te_sysutildata.ini Thu Sep 02 21:48:26 2010 +0300 @@ -822,7 +822,7 @@ ModelNameError = 0 ModelCode = Symbian -ModelCodeError = 1 +ModelCodeError = 0 RevisionID = 001.234 RevisionIDError = 0 @@ -830,8 +830,8 @@ DefaultDeviceName = Symbian DefaultDeviceNameError = 1 -UIPlatformName = Symbian -UIPlatformNameError = 1 +UIPlatformName = S60 +UIPlatformNameError = 0 UIPlatformVersion = 654.987 UIPlatformVersionStringError = 0 diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/group/bld.inf --- a/commonservices/sysutil/test/tef/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/group/bld.inf Thu Sep 02 21:48:26 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" @@ -62,6 +62,10 @@ ../../data/lang_valid.txt z:/resource/versions/lang_valid.txt ../../data/langsw_valid.txt z:/resource/versions/langsw_valid.txt ../../data/purpose_valid.txt z:/resource/versions/purpose_valid.txt +../../data/sw_test.txt z:/resource/versions/test/sw.txt +../../data/lang_test.txt z:/resource/versions/test/lang.txt +../../data/langsw_test.txt z:/resource/versions/test/langsw.txt +../../data/purpose_test.txt z:/resource/versions/test/purpose.txt ../../data/deviceattributes_empty_file.ini z:/resource/versions/deviceattributes_empty_file.ini ../../data/deviceattributes_invalid_format.ini z:/resource/versions/deviceattributes_invalid_format.ini diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/group/te_sysutilteftests.iby --- a/commonservices/sysutil/test/tef/group/te_sysutilteftests.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/group/te_sysutilteftests.iby Thu Sep 02 21:48:26 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" @@ -42,12 +42,16 @@ #ifndef SYSUTIL_Z_DRIVE_FILES_PRESENT #define SYSUTIL_Z_DRIVE_FILES_PRESENT -//data = EPOCROOT##epoc32\data\z\resource\versions\lang.txt \resource\versions\lang.txt -//data = EPOCROOT##epoc32\data\z\resource\versions\langsw.txt \resource\versions\langsw.txt -//data = EPOCROOT##epoc32\data\z\resource\versions\sw.txt \resource\versions\sw.txt -//data = EPOCROOT##epoc32\data\z\resource\versions\purpose.txt \resource\versions\purpose.txt +data = EPOCROOT##epoc32\data\z\resource\versions\lang.txt \resource\versions\lang.txt +data = EPOCROOT##epoc32\data\z\resource\versions\langsw.txt \resource\versions\langsw.txt +data = EPOCROOT##epoc32\data\z\resource\versions\purpose.txt \resource\versions\purpose.txt #endif +data = EPOCROOT##epoc32\data\z\resource\versions\test\lang.txt \resource\versions\test\lang.txt +data = EPOCROOT##epoc32\data\z\resource\versions\test\langsw.txt \resource\versions\test\langsw.txt +data = EPOCROOT##epoc32\data\z\resource\versions\test\sw.txt \resource\versions\test\sw.txt +data = EPOCROOT##epoc32\data\z\resource\versions\test\purpose.txt \resource\versions\test\purpose.txt + data = EPOCROOT##epoc32\data\z\resource\versions\nocontent\lang.txt \resource\versions\nocontent\lang.txt data = EPOCROOT##epoc32\data\z\resource\versions\nocontent\langsw.txt \resource\versions\nocontent\langsw.txt data = EPOCROOT##epoc32\data\z\resource\versions\nocontent\sw.txt \resource\versions\nocontent\sw.txt diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutilburtestsuite/src/te_sysutiltestversioninfo.cpp --- a/commonservices/sysutil/test/tef/te_sysutilburtestsuite/src/te_sysutiltestversioninfo.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutilburtestsuite/src/te_sysutiltestversioninfo.cpp Thu Sep 02 21:48:26 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" @@ -98,9 +98,13 @@ */ void CSysUtilTestVersionInfoStep::TestAllAPIsL() { - SetTestPath(EFalse); - - TBool passed = ETrue; + TBool passed = ETrue; + TInt error = SetTestPath(ETrue); + if(KErrNone != error) + { + RDebug::Printf("Setting test path to ETrue failed with error %d", error); + passed = EFalse; + } TBuf16 actualValue; RDebug::Printf("Testing SW Version \n"); diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/scripts/te_sysutiltestsuite.script --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/scripts/te_sysutiltestsuite.script Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/scripts/te_sysutiltestsuite.script Thu Sep 02 21:48:26 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" @@ -19,12 +19,15 @@ RUN_UTILS MkDir c:\versions +RUN_UTILS CopyFile z:\resource\versions\test\purpose.txt c:\versions\purpose.txt +RUN_UTILS MakeReadWrite c:\versions\purpose.txt + START_TESTCASE SYSLIB-BAFL-CT-4068 //!@SYMTestCaseID SYSLIB-BAFL-CT-4068 //!@SYMTestCaseDesc To ensure the pr information can be obtained correctly and //!@SYMTestCaseDesc contains the correct information. //!@SYMTestPriority High -//!@SYMTestActions Get the pr information from Z:\resource\versions\purpose.txt +//!@SYMTestActions Get the pr information from Z:\resource\versions\test\purpose.txt //!@SYMTestActions using the SysUtil::GetPRInformation method and compare it against //!@SYMTestActions a string literal set in an ini file. The ini file is located //!@SYMTestActions in z:\testdata\inifiles\. @@ -34,12 +37,17 @@ RUN_TEST_STEP 1000 te_sysutiltestsuite SysUtilsGetPRInformation z:\testdata\inifiles\te_sysutildata.ini ResourceFiles END_TESTCASE SYSLIB-BAFL-CT-4068 +RUN_UTILS DeleteFile c:\versions\purpose.txt + +RUN_UTILS CopyFile z:\resource\versions\test\sw.txt c:\versions\sw.txt +RUN_UTILS MakeReadWrite c:\versions\sw.txt + START_TESTCASE SYSLIB-BAFL-CT-4001 //!@SYMTestCaseID SYSLIB-BAFL-CT-4001 //!@SYMTestCaseDesc To ensure the software version can be obtained correctly and //!@SYMTestCaseDesc contains the correct information. //!@SYMTestPriority High -//!@SYMTestActions Get the software version from Z:\resource\versions\sw.txt +//!@SYMTestActions Get the software version from Z:\resource\versions\test\sw.txt //!@SYMTestActions using the SysUtil::GetSWVersion method and compare it against //!@SYMTestActions a string literal set in an ini file. The ini file is located //!@SYMTestActions in z:\testdata\inifiles\. @@ -49,13 +57,17 @@ RUN_TEST_STEP 1000 te_sysutiltestsuite SysUtilsGetSWVersion z:\testdata\inifiles\te_sysutildata.ini ResourceFiles END_TESTCASE SYSLIB-BAFL-CT-4001 +RUN_UTILS DeleteFile c:\versions\sw.txt + +RUN_UTILS CopyFile z:\resource\versions\test\langsw.txt c:\versions\langsw.txt +RUN_UTILS MakeReadWrite c:\versions\langsw.txt START_TESTCASE SYSLIB-BAFL-CT-4002 //!@SYMTestCaseID SYSLIB-BAFL-CT-4002 //!@SYMTestCaseDesc To ensure the language software version can be obtained //!@SYMTestCaseDesc correctly and contains the correct information. //!@SYMTestPriority High -//!@SYMTestActions Get the software language version from Z:\resource\versions\langsw.txt +//!@SYMTestActions Get the software language version from Z:\resource\versions\test\langsw.txt //!@SYMTestActions using the SysUtil::GetLangSWVersion method and compare it //!@SYMTestActions against a string literal set in an ini file. The ini file is //!@SYMTestActions located in z:\testdata\inifiles\. @@ -66,13 +78,17 @@ RUN_TEST_STEP 1000 te_sysutiltestsuite SysUtilsGetLangSWVersion z:\testdata\inifiles\te_sysutildata.ini ResourceFiles END_TESTCASE SYSLIB-BAFL-CT-4002 +RUN_UTILS DeleteFile c:\versions\langsw.txt + +RUN_UTILS CopyFile z:\resource\versions\test\lang.txt c:\versions\lang.txt +RUN_UTILS MakeReadWrite c:\versions\lang.txt START_TESTCASE SYSLIB-BAFL-CT-4003 //!@SYMTestCaseID SYSLIB-BAFL-CT-4003 //!@SYMTestCaseDesc To ensure the language version can be obtained correctly and //!@SYMTestCaseDesc contains the correct information. //!@SYMTestPriority High -//!@SYMTestActions Get the language version from Z:\resource\versions\lang.txt +//!@SYMTestActions Get the language version from Z:\resource\versions\test\lang.txt //!@SYMTestActions using the SysUtil::GetLangVersion method an compare it against //!@SYMTestActions a string literal set in an ini file. The ini file is located //!@SYMTestActions in z:\testdata\inifiles\. @@ -82,6 +98,8 @@ RUN_TEST_STEP 1000 te_sysutiltestsuite SysUtilsGetLangVersion z:\testdata\inifiles\te_sysutildata.ini ResourceFiles END_TESTCASE SYSLIB-BAFL-CT-4003 +RUN_UTILS DeleteFile c:\versions\lang.txt + START_TESTCASE SYSLIB-BAFL-CT-4004 //!@SYMTestCaseID SYSLIB-BAFL-CT-4004 diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/src/sysutilplugin.cpp --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/sysutilplugin.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/sysutilplugin.cpp Thu Sep 02 21:48:26 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" @@ -33,6 +33,11 @@ value.Set(KModelNameValue); aKeys.Append(KModelNameUid.iUid); aValues.AppendL(value); + + _LIT16(KModelCodeValue, "Symbian"); + value.Set(KModelCodeValue); + aKeys.Append(KModelCodeUid.iUid); + aValues.AppendL(value); _LIT16(KRevisionIDValue, "001.234"); value.Set(KRevisionIDValue); diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangswversion.cpp --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangswversion.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangswversion.cpp Thu Sep 02 21:48:26 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,6 +27,7 @@ */ CSysUtilsGetLangSWVersionStep::~CSysUtilsGetLangSWVersionStep() { + SetTestPath(EFalse); } /** @@ -61,7 +62,7 @@ version.Insert(0,KDummy); - TInt fileErr = CheckIsFileExist( _L("Z:\\resource\\versions\\langsw.txt")); + TInt fileErr = CheckIsFileExist( _L("C:\\versions\\langsw.txt")); if(fileErr == KErrNone) { @@ -74,7 +75,7 @@ } INFO_PRINTF1(_L("Deleted P&S properties successfully.")); - err = SetTestPath(EFalse); + err = SetTestPath(ETrue); if( err != KErrNone ) { ERR_PRINTF2(_L("Could not turn test path off. Error = %d"), err); @@ -113,7 +114,11 @@ if (version.Compare(testBuf)!=0) { ERR_PRINTF1(_L("software language formatted incorrectly")); - INFO_PRINTF1(testBuf); + ERR_PRINTF1(_L("From ini file: ")); + ERR_PRINTF1(testBuf); + ERR_PRINTF1(_L("From txt file: ")); + ERR_PRINTF1(version); + ERR_PRINTF2(_L("Comparison returned value %d"), version.Compare(testBuf)); SetTestStepResult(EFail); } else @@ -132,6 +137,7 @@ SetTestStepResult(EFail); } + SetTestPath(EFalse); return TestStepResult(); } diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangversion.cpp --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangversion.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangversion.cpp Thu Sep 02 21:48:26 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,6 +28,7 @@ CSysUtilsGetLangVersionStep::~CSysUtilsGetLangVersionStep() { + SetTestPath(EFalse); } /** @@ -63,7 +64,7 @@ version.Insert(0,KDummy); - TInt fileErr = CheckIsFileExist( _L("Z:\\resource\\versions\\lang.txt")); + TInt fileErr = CheckIsFileExist( _L("C:\\versions\\lang.txt")); /* This test is not valid if file does not exist * Reason for missing file is that "english engineering" package @@ -80,7 +81,7 @@ } INFO_PRINTF1(_L("Deleted P&S properties successfully.")); - err = SetTestPath(EFalse); + err = SetTestPath(ETrue); if( err != KErrNone ) { ERR_PRINTF2(_L("Could not turn test path off. Error = %d"), err); @@ -119,7 +120,11 @@ if (version.Compare(testBuf)!=0) { ERR_PRINTF1(_L("language version formatted incorrectly")); + INFO_PRINTF1(_L("From ini file: ")); INFO_PRINTF1(testBuf); + INFO_PRINTF1(_L("From txt file: ")); + INFO_PRINTF1(version); + INFO_PRINTF2(_L("Comparison returned value %d"), version.Compare(testBuf)); SetTestStepResult(EFail); } else @@ -137,7 +142,8 @@ ERR_PRINTF1(_L("Lang.txt is missing, should be included to base packets")); SetTestStepResult(EFail); } - + + SetTestPath(EFalse); return TestStepResult(); } diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetprinformation.cpp --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetprinformation.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetprinformation.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -28,6 +28,7 @@ */ CSysUtilsGetPRInformationStep::~CSysUtilsGetPRInformationStep() { + SetTestPath(EFalse); } /** @@ -62,8 +63,7 @@ TBuf16 version; version.Insert(0,KDummy); - TInt fileErr = CheckIsFileExist( _L("Z:\\resource\\versions\\purpose.txt")); - + TInt fileErr = CheckIsFileExist( _L("C:\\versions\\purpose.txt")); if(fileErr == KErrNone) { err = DeletePSProperties(); @@ -75,7 +75,7 @@ } INFO_PRINTF1(_L("Deleted P&S properties successfully.")); - err = SetTestPath(EFalse); + err = SetTestPath(ETrue); if( err != KErrNone ) { ERR_PRINTF2(_L("Could not turn test path off. Error = %d"), err); @@ -112,7 +112,11 @@ if (version.Compare(testBuf)!=0) { ERR_PRINTF1(_L("PR Information formatted incorrectly")); - INFO_PRINTF1(testBuf); + INFO_PRINTF1(_L("From ini file: ")); + INFO_PRINTF1(testBuf); + INFO_PRINTF1(_L("From txt file: ")); + INFO_PRINTF1(version); + INFO_PRINTF2(_L("Comparison returned value %d"), version.Compare(testBuf)); SetTestStepResult(EFail); } else @@ -130,6 +134,8 @@ ERR_PRINTF1(_L("purpose.txt is missing, should be included to base packets")); SetTestStepResult(EFail); } + + err = SetTestPath(EFalse); return TestStepResult(); } diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetswversion.cpp --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetswversion.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetswversion.cpp Thu Sep 02 21:48:26 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,6 +27,7 @@ */ CSysUtilsGetSWVersionStep::~CSysUtilsGetSWVersionStep() { + SetTestPath(EFalse); } /** @@ -61,7 +62,7 @@ TBuf16 version; version.Insert(0,KDummy); - TInt fileErr = CheckIsFileExist( _L("Z:\\resource\\versions\\sw.txt")); + TInt fileErr = CheckIsFileExist( _L("C:\\versions\\sw.txt")); if(fileErr == KErrNone) { @@ -74,7 +75,7 @@ } INFO_PRINTF1(_L("Deleted P&S properties successfully.")); - err = SetTestPath(EFalse); + err = SetTestPath(ETrue); if( err != KErrNone ) { ERR_PRINTF2(_L("Could not turn test path off. Error = %d"), err); @@ -113,7 +114,11 @@ if (version.Compare(testBuf)!=0) { ERR_PRINTF1(_L("software version formatted incorrectly")); - INFO_PRINTF1(testBuf); + INFO_PRINTF1(_L("From ini file: ")); + INFO_PRINTF1(testBuf); + INFO_PRINTF1(_L("From txt file: ")); + INFO_PRINTF1(version); + INFO_PRINTF2(_L("Comparison returned value %d"), version.Compare(testBuf)); SetTestStepResult(EFail); } else @@ -131,7 +136,8 @@ ERR_PRINTF1(_L("sw.txt is missing, should be included to base packets")); SetTestStepResult(EFail); } - + + SetTestPath(EFalse); return TestStepResult(); } diff -r 072a9626b290 -r 09d657f1ee00 commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsoomtest.cpp --- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsoomtest.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsoomtest.cpp Thu Sep 02 21:48:26 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" @@ -79,7 +79,14 @@ TBuf16 version; version.Insert(0,kDummy); - TInt err = DeletePSProperties(); + TInt err = SetTestPath(EFalse); + if(err != KErrNone) + { + WARN_PRINTF2(_L("Could not set test path to EFalse. Error = %d"), err); + SetTestStepResult(EAbort); + return TestStepResult(); + } + err = DeletePSProperties(); if(err != KErrNone) { WARN_PRINTF2(_L("Could not delete P&S properties. Error = %d"), err); diff -r 072a9626b290 -r 09d657f1ee00 devicesrv_plat/accessory_policy_definitions_api/inc/AccPolCommonNameValuePairs.h --- a/devicesrv_plat/accessory_policy_definitions_api/inc/AccPolCommonNameValuePairs.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrv_plat/accessory_policy_definitions_api/inc/AccPolCommonNameValuePairs.h Thu Sep 02 21:48:26 2010 +0300 @@ -306,6 +306,15 @@ const TUint32 KAccRTPStreaming = 0x0013; // REQ-417-64804: In-Car optimized Device +// Name: FM Antenna Support +// Value: N/A +// Dynamic Type: Static +// I/O: From accessory to terminal, input. +// Description: indicates that accessory has FM antenna support for audio data. +// Bitmask: 000000 00000 10100 +const TUint32 KAccFMAntennaSupport = 0x0014; + + // CAR KIT SB NAME-VALUE PAIRS: diff -r 072a9626b290 -r 09d657f1ee00 devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h --- a/devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h Thu Sep 02 21:48:26 2010 +0300 @@ -143,12 +143,12 @@ * Detect all subblock capabilities and append them to the given * array. */ - void ParseSubblocks( const TUint64& aVal, RArray& aCaps ); + void ParseSubblocksL( const TUint64& aVal, RArray& aCaps ); /** * Detect all subblock names and append them to the given array. */ - void ParseNames( const TUint32& aVal, RArray& aNames ); + void ParseNamesL( const TUint32& aVal, RArray& aNames ); /** * Find a bit number from bitmask. diff -r 072a9626b290 -r 09d657f1ee00 devicesrv_plat/syslangutil_api/inc/syslangutil.h --- a/devicesrv_plat/syslangutil_api/inc/syslangutil.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrv_plat/syslangutil_api/inc/syslangutil.h Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2000-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2000-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" @@ -84,13 +84,67 @@ IMPORT_C static TInt RestoreSIMLanguage( TInt &aLanguage, RFs* aFileServerSession = NULL ); + + /** + * Changes the Language to the one which is passed as an argument. + * @param aLanguageCode Language to be set . + * + * @return returns KErrNone if everything is OK, otherwise returns + * errorcode. + */ + IMPORT_C static TInt SysLangUtil::ChangeLanguage(const TInt aLanguageCode); + + /** + * Changes the region to the one which is passed as an argument. + * @param aRegionCode region code to be set . + * + * @return returns KErrNone if everything is OK, otherwise returns + * errorcode. + */ + IMPORT_C static TInt SysLangUtil::ChangeRegion(const TInt aRegionCode); + + /** + * Changes the collation to the one which is passed as an argument. + * @param aCollationCode collation to be set . + * + * @return returns KErrNone if everything is OK, otherwise returns + * errorcode. + */ + + IMPORT_C static TInt SysLangUtil::ChangeCollation(const TInt aCollationCode); + + /** + * Checks and returns installed regions in a param given. + * @param aRegions Symbian regions as a arrayfixflat, ownership + * given to user, so user must take care of proper cleanup! + * @param aFileServerSession Optional file server session handle. If + * omitted, new one will be created. + * @return returns KErrNone if everything went OK, otherwise returns + * the errorcode. + */ + IMPORT_C static TInt SysLangUtil::GetInstalledRegions(CArrayFixFlat*& aRegions, + RFs* aFileServerSession = NULL ); + + /** + * Checks and returns installed collations in a param given. + * @param aRegions Symbian collations as a arrayfixflat, ownership + * given to user, so user must take care of proper cleanup! + * @param aFileServerSession Optional file server session handle. If + * omitted, new one will be created. + * @return returns KErrNone if everything went OK, otherwise returns + * the errorcode. + */ + + IMPORT_C static TInt SysLangUtil::GetInstalledCollations(CArrayFixFlat*& aCollations, + RFs* aFileServerSession = NULL ); private: // Utility: static RFs* CheckFS( RFs* aRFs, TBool &aExist, TInt &aErr ); - + static void LoadDllL( const TUint32 aCategory,const TInt aCode, const TDesC& aDllNameBase ); + static void ReadFileL(CArrayFixFlat*& aArray, const TDesC& aFilePath, RFs* aFileServerSession = NULL ); }; #endif // SYSLANGUTIL_H diff -r 072a9626b290 -r 09d657f1ee00 devicesrvapitest/accessorieshaitest/accessories/group/t_accessories.mmp --- a/devicesrvapitest/accessorieshaitest/accessories/group/t_accessories.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrvapitest/accessorieshaitest/accessories/group/t_accessories.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -33,12 +33,7 @@ USERINCLUDE ../inc USERINCLUDE ../../common/inc -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/oem -SYSTEMINCLUDE /epoc32/include/test -SYSTEMINCLUDE /epoc32/include/kernel - - +OS_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY efsrv.lib diff -r 072a9626b290 -r 09d657f1ee00 devicesrvapitest/accessorieshaitest/accessories/inc/t_accessoriesserver.h --- a/devicesrvapitest/accessorieshaitest/accessories/inc/t_accessoriesserver.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrvapitest/accessorieshaitest/accessories/inc/t_accessoriesserver.h Thu Sep 02 21:48:26 2010 +0300 @@ -20,7 +20,7 @@ #define T_ACCESSORIES_SERVER_H //EPOC Includes -#include +#include /** * This wrapper class extends the test server and creates test server for Accessories diff -r 072a9626b290 -r 09d657f1ee00 devicesrvapitest/accessorieshaitest/common/inc/datawrapperbase.h --- a/devicesrvapitest/accessorieshaitest/common/inc/datawrapperbase.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrvapitest/accessorieshaitest/common/inc/datawrapperbase.h Thu Sep 02 21:48:26 2010 +0300 @@ -20,7 +20,7 @@ #define DATA_WRAPPER_BASE_H // EPOC includes -#include +#include #define SECS_TO_MS(x) (x*1000000) _LIT(KConsname, "Test Console"); diff -r 072a9626b290 -r 09d657f1ee00 devicesrvapitest/hwrmhaitest/common/inc/DataWrapperBase.h --- a/devicesrvapitest/hwrmhaitest/common/inc/DataWrapperBase.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrvapitest/hwrmhaitest/common/inc/DataWrapperBase.h Thu Sep 02 21:48:26 2010 +0300 @@ -20,7 +20,7 @@ #define DATA_WRAPPER_BASE_H // EPOC includes -#include +#include #define SECS_TO_MS(x) (x*1000000) _LIT(KConsname, "Test Console"); diff -r 072a9626b290 -r 09d657f1ee00 devicesrvapitest/hwrmhaitest/hwrm/group/T_HWRM.mmp --- a/devicesrvapitest/hwrmhaitest/hwrm/group/T_HWRM.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrvapitest/hwrmhaitest/hwrm/group/T_HWRM.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -35,10 +35,7 @@ USERINCLUDE ../inc USERINCLUDE ../../common/inc -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/oem -SYSTEMINCLUDE /epoc32/include/test -SYSTEMINCLUDE /epoc32/include/kernel +OS_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY efsrv.lib diff -r 072a9626b290 -r 09d657f1ee00 devicesrvapitest/hwrmhaitest/hwrm/inc/T_HwrmServer.h --- a/devicesrvapitest/hwrmhaitest/hwrm/inc/T_HwrmServer.h Wed Aug 18 11:03:14 2010 +0300 +++ b/devicesrvapitest/hwrmhaitest/hwrm/inc/T_HwrmServer.h Thu Sep 02 21:48:26 2010 +0300 @@ -20,7 +20,7 @@ #define T_HWRM_SERVER_H //EPOC Includes -#include +#include /** * This wrapper class extends the test server and creates test server for Accessories diff -r 072a9626b290 -r 09d657f1ee00 dosservices/commondsy/rom/CommonDSY.iby --- a/dosservices/commondsy/rom/CommonDSY.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/dosservices/commondsy/rom/CommonDSY.iby Thu Sep 02 21:48:26 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" @@ -22,7 +22,7 @@ // CommonDSY.IBY #ifdef __COMMON_DSY -file=ABI_DIR\BUILD_DIR\CommonDSY.DLL SHARED_LIB_DIR\CommonDSY.DLL +file=ABI_DIR\BUILD_DIR\commondsy.dll SHARED_LIB_DIR\commondsy.dll data=ABI_DIR\BUILD_DIR\Z\private\101f6efa\dosserver.ini \private\101f6efa\dosserver.ini diff -r 072a9626b290 -r 09d657f1ee00 dosservices/dosserver/rom/dosserver.iby --- a/dosservices/dosserver/rom/dosserver.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/dosservices/dosserver/rom/dosserver.iby Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2004 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" @@ -19,9 +19,9 @@ #ifndef __DosServer_IBY__ #define __DosServer_IBY__ -file=ABI_DIR\BUILD_DIR\DosSrv.dll SHARED_LIB_DIR\DosSrv.dll -file=ABI_DIR\BUILD_DIR\DosServer.exe PROGRAMS_DIR\DosServer.exe -file=ABI_DIR\BUILD_DIR\DSClient.dll SHARED_LIB_DIR\DSClient.dll +file=ABI_DIR\BUILD_DIR\dossrv.dll SHARED_LIB_DIR\dossrv.dll +file=ABI_DIR\BUILD_DIR\dosserver.exe PROGRAMS_DIR\dosserver.exe +file=ABI_DIR\BUILD_DIR\dsclient.dll SHARED_LIB_DIR\dsclient.dll #endif //__DosServer_IBY__ diff -r 072a9626b290 -r 09d657f1ee00 hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp --- a/hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/hwrmhaptics/hapticspluginmanager/group/hwrmhapticspluginmanager.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -45,7 +45,7 @@ USERINCLUDE ../../hapticsserver/inc OS_LAYER_SYSTEMINCLUDE -SYSTEMINCLUDE /epoc32/include/stdapis +OS_LAYER_LIBC_SYSTEMINCLUDE LIBRARY efsrv.lib LIBRARY estor.lib diff -r 072a9626b290 -r 09d657f1ee00 mediator/inc/Server/MediatorServerObjects.h --- a/mediator/inc/Server/MediatorServerObjects.h Wed Aug 18 11:03:14 2010 +0300 +++ b/mediator/inc/Server/MediatorServerObjects.h Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 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" @@ -827,14 +827,7 @@ */ RPointerArray& GetObservers(); - /** - * Adds an array of observers to event - * @since S60 3.1 - * @param aObservers reference to observer array - * @return None. - */ - void AddObservers( RPointerArray& aObservers ); - + /** * Gets TEvent structure of the current event * @since S60 3.1 diff -r 072a9626b290 -r 09d657f1ee00 mediator/src/Client/MediatorServerClient.cpp --- a/mediator/src/Client/MediatorServerClient.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/mediator/src/Client/MediatorServerClient.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -465,7 +465,7 @@ command.iCommandId = aCommandId; command.iVersion = aVersion; //Time out is initiatilized to 0 as its not used on the server side. - //this is just to compress the tool warnings. + //this is just to supress the tool warnings. command.iTimeout = 0; TCommandBuffer commandBuffer( command ); @@ -504,6 +504,12 @@ // And command TCommand command; command.iCommandId = aCommandId; + //All the remaining parameters of TCommand are initiatilized to 0 as its not used on the server side. + //this is just to suppress the tool warnings. + command.iVersion = TVersion(0,0,0); + command.iCaps.SetEmpty(); + command.iTimeout = 0; + TCommandBuffer commandBuffer( command ); // Status @@ -542,6 +548,12 @@ // And command TCommand command; command.iCommandId = aCommandId; + //All the remaining parameters of TCommand are initiatilized to 0 as its not used on the server side. + //this is just to suppress the tool warnings. + command.iVersion = TVersion(0,0,0); + command.iCaps.SetEmpty(); + command.iTimeout = 0; + TCommandBuffer commandBuffer( command ); // Send the command diff -r 072a9626b290 -r 09d657f1ee00 mediator/src/Server/MediatorServerObjects.cpp --- a/mediator/src/Server/MediatorServerObjects.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/mediator/src/Server/MediatorServerObjects.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 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" @@ -1079,20 +1079,6 @@ } // ----------------------------------------------------------------------------- -// CEvent::AddObservers -// -// ----------------------------------------------------------------------------- -// -void CEvent::AddObservers( RPointerArray& aObservers ) - { - // Check that observer does not exists already for this event - for (TInt index = 0; index < aObservers.Count(); index++ ) - { - iObservers.Append( aObservers[index] ); - } - } - -// ----------------------------------------------------------------------------- // CEvent::Event // Returns EItemEvent // ----------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 package_definition.xml --- a/package_definition.xml Wed Aug 18 11:03:14 2010 +0300 +++ b/package_definition.xml Thu Sep 02 21:48:26 2010 +0300 @@ -1,295 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 072a9626b290 -r 09d657f1ee00 package_definition_v2.xml --- a/package_definition_v2.xml Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,295 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 072a9626b290 -r 09d657f1ee00 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,1 @@ + diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/inc/client/psmclientimpl.h --- a/psmservices/psmserver/inc/client/psmclientimpl.h Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/inc/client/psmclientimpl.h Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -74,6 +74,14 @@ */ CPsmSettings& PsmSettings() const; +#ifdef _DEBUG + // these functions are used only for testing + virtual TInt HeapMark(); + virtual TInt HeapMarkEnd(); + virtual TInt HeapReset(); + virtual TInt SetHeapFailure(TInt aFailureRate); +#endif //_DEBUG + private: /** diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/inc/engine/psmmanager.h --- a/psmservices/psmserver/inc/engine/psmmanager.h Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/inc/engine/psmmanager.h Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -72,7 +72,7 @@ /** * Register new PSM observer. Adds observer to the list of registered observers */ - void RegisterObserver( MPsmModeChangeObserver* aObserver ); + void RegisterObserverL( MPsmModeChangeObserver* aObserver ); /** * Unreqister observer. Removes observer from the list of registered observers @@ -89,6 +89,19 @@ */ void IssueRequest(); +#ifdef _DEBUG + /** + * Delete plugin loader. Used only for testing purpose + */ + void ClosePluginLoader(); + + /** + * Compress ModeObservers Array. Used only for testing purpose + */ + void CompressModeObserversArray(); + +#endif //_DEBUG + protected: // From CActive /** diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/inc/server/psmsrvmessage.h --- a/psmservices/psmserver/inc/server/psmsrvmessage.h Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/inc/server/psmsrvmessage.h Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -74,6 +74,11 @@ * Observes the mode change completion */ void NotifyPsmModeChangeComplete( const TInt aError ); + + /** + * Returns the message handle + */ + TInt MessageHandle( ) const; private: diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/inc/server/psmsrvsession.h --- a/psmservices/psmserver/inc/server/psmsrvsession.h Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/inc/server/psmsrvsession.h Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -61,6 +61,11 @@ * Service requests */ void ServiceL( const RMessage2& aMessage ); + + /** + * ServiceError handling + */ + void ServiceError(const RMessage2 &aMessage, TInt aError); private: @@ -74,10 +79,6 @@ */ void ConstructL(); - /** - * Handles client requests - */ - void DispatchL( const RMessage2& aMessage ); /** * Handles settings related requests @@ -106,11 +107,6 @@ */ CPsmMessage* iNotifyModeMessage; - /** - * Config array for Settings handling - */ - RConfigInfoArray iConfigArray; - }; #endif // PSMSRVSESSION_H diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/inc/util/psmclientserver.h --- a/psmservices/psmserver/inc/util/psmclientserver.h Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/inc/util/psmclientserver.h Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -66,6 +66,16 @@ */ EPsmServerCancelModeChangeNotificationRequest, + /** + * Used only for testing purpose and in debug builds only. + * Not declared under _DEBUG because command ids will be + * different in udeb and urel version, will lead to confusion + */ + EDebugHeapMark, + EDebugHeapMarkEnd, + EDebugSetHeapFailure, + EDebugHeapReset, + // --------------------------------------------------------------- // End of enum // --------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/client/psmclientimpl.cpp --- a/psmservices/psmserver/src/client/psmclientimpl.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/client/psmclientimpl.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -63,12 +63,10 @@ CPsmClientImpl::~CPsmClientImpl() { COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::~CPsmClientImpl()" ) ) ); - + CancelPowerSaveModeChange(); - delete iActive; delete iSettings; - iPsmServer.Close(); COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::~CPsmClientImpl - return" ) ) ); @@ -169,4 +167,39 @@ return *iSettings; } +#ifdef _DEBUG +TInt CPsmClientImpl::HeapMark() + { + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMark()" ) ) ); + TInt err = iPsmServer.SendReceiveSync( EDebugHeapMark, TIpcArgs() ); + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMark - return" ) ) ); + return err; + } + +TInt CPsmClientImpl::HeapMarkEnd() + { + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMarkEnd()" ) ) ); + TInt err = iPsmServer.SendReceiveSync( EDebugHeapMarkEnd, TIpcArgs() ); + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMarkEnd - return" ) ) ); + return err; + } + +TInt CPsmClientImpl::SetHeapFailure(TInt aFailureRate) + { + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::SetHeapFailure()" ) ) ); + TInt err = iPsmServer.SendReceiveSync( EDebugSetHeapFailure, TIpcArgs(aFailureRate) ); + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::SetHeapFailure - return" ) ) ); + return err; + } + +TInt CPsmClientImpl::HeapReset() + { + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapReset()" ) ) ); + TInt err = iPsmServer.SendReceiveSync( EDebugHeapReset, TIpcArgs() ); + COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapReset - return" ) ) ); + return err; + } + +#endif //_DEBUG + // End of file diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/engine/psmbackupstorage.cpp --- a/psmservices/psmserver/src/engine/psmbackupstorage.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/engine/psmbackupstorage.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -274,7 +274,10 @@ // reset error value trapErr = KErrNone; } - + else if ( KErrNoMemory == trapErr ) + { + User::Leave(trapErr); + } COMPONENT_TRACE( ( _L( "PSM Server - CPsmBackupStorage::UpdateBackupL() - Config count: %i" ), aConfigArray.Count() ) ); // Loop config array and update storage @@ -287,9 +290,19 @@ // Search set element from config and create new if not found TXmlEngElement setItem; TRAP( trapErr, setItem = FindSetItemL( settings, configInfo.iConfigId ) ); - - // If not found, create new - if ( KErrNotFound == trapErr && setItem.IsNull() ) + + COMPONENT_TRACE( ( _L( "PSM Server - FindSetItemL() TRAP error - %d" ), trapErr ) ); + + if ( KErrNoMemory == trapErr && setItem.IsNull() ) + { + User::Leave(trapErr); + } + else if (KErrNoMemory == trapErr) + { + setItem.RemoveAttributeL( KPsmSetItemValue ); + User::Leave(trapErr); + } + else if ( KErrNotFound == trapErr && setItem.IsNull() ) { // First param indicates that cannot have childs, // second is the owner document and last is tag diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/engine/psmmanager.cpp --- a/psmservices/psmserver/src/engine/psmmanager.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/engine/psmmanager.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -113,8 +113,8 @@ if ( iPluginLoader ) { delete iPluginLoader; - } - + } + // Close mode observers array iModeObservers.Close(); @@ -286,14 +286,14 @@ } // ----------------------------------------------------------------------------- -// CPsmManager::RegisterObserver +// CPsmManager::RegisterObserverL // ----------------------------------------------------------------------------- // -void CPsmManager::RegisterObserver( MPsmModeChangeObserver* aObserver ) +void CPsmManager::RegisterObserverL( MPsmModeChangeObserver* aObserver ) { - COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserver()" ) ) ); - iModeObservers.Append( aObserver ); - COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserver - return" ) ) ); + COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserverL()" ) ) ); + iModeObservers.AppendL( aObserver ); + COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserverL() return" ) ) ); } // ----------------------------------------------------------------------------- @@ -326,4 +326,27 @@ return *iSettingsHandler; } +#ifdef _DEBUG +// ----------------------------------------------------------------------------- +// CPsmManager::ClosePluginLoader +// For testing purpose +// ----------------------------------------------------------------------------- +void CPsmManager::ClosePluginLoader() + { + if(iPluginLoader) + { + delete iPluginLoader; + iPluginLoader=NULL; + } + } + +// ----------------------------------------------------------------------------- +// CPsmManager::CompressModeObserversArray +// For testing purpose +// ----------------------------------------------------------------------------- +void CPsmManager::CompressModeObserversArray() + { + iModeObservers.Compress(); + } +#endif // _DEBUG // End of file diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/engine/psmsettingshandler.cpp --- a/psmservices/psmserver/src/engine/psmsettingshandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/engine/psmsettingshandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -25,6 +25,29 @@ #include "psmtrace.h" // ----------------------------------------------------------------------------- +// CloseHandler +// closes the storage handler +// ----------------------------------------------------------------------------- +// +void CleanupStorage(TAny* aPtr) + { + CPsmStorage* self = static_cast (aPtr); + //Ignore the Trap as Cleanup can't leave. + TRAP_IGNORE(self->CloseStorageL()); + } + +// ----------------------------------------------------------------------------- +// CloseHandler +// closes the backup storage handler +// ----------------------------------------------------------------------------- +// +void CleanupBackupStorage(TAny* aPtr) + { + CPsmBackupStorage* self = static_cast (aPtr); + //Ignore the Trap as Cleanup can't leave. + TRAP_IGNORE(self->CloseStorageL()); + } + // CPsmSettingsHandler::NewL // Two-phased constructor. // ----------------------------------------------------------------------------- @@ -114,10 +137,13 @@ RConfigInfoArray& aPsmConfigArray, TUint32 aRepository ) { COMPONENT_TRACE( ( _L( "PSM Server - CPsmSettingsHandler::BackupAndGetSettingsL()" ) ) ); + //Close config handle in case of any error + CleanupStack::PushL(TCleanupItem(CleanupStorage, iConfigStorage)); // Change settings from normal config storage iConfigStorage->InitStorageL( aRepository ); ChangeSettingsL( aPsmConfigArray, aRepository, *iConfigStorage ); iConfigStorage->CloseStorageL(); + CleanupStack::Pop(iConfigStorage); COMPONENT_TRACE( ( _L( "PSM Server - CPsmSettingsHandler::BackupAndGetSettingsL() - return" ) ) ); } @@ -226,7 +252,9 @@ // First, get current settings RConfigInfoArray currentSettings; CleanupClosePushL( currentSettings ); - + + //Close backup handler in case of any error + CleanupStack::PushL(TCleanupItem(CleanupBackupStorage, iBackupStorage)); iBackupStorage->InitStorageL( aRepository ); iBackupStorage->ListCurrentSettingSetL( currentSettings ); @@ -245,8 +273,8 @@ if ( !found ) { // Add new settings to backup - settingsToBackUp.Append( aPsmConfigArray[ i ] ); - currentSettings.Append( aPsmConfigArray[ i ] ); + settingsToBackUp.AppendL( aPsmConfigArray[ i ] ); + currentSettings.AppendL( aPsmConfigArray[ i ] ); } } @@ -272,7 +300,7 @@ RConfigInfoArray settingsFromBackUp; CleanupClosePushL( settingsFromBackUp ); - for ( TInt i = 0; currentSettings.Count() != i; i++ ) + for ( TInt i = 0; currentSettings.Count() != i; ++i ) { TPsmsrvConfigInfo& currentInfo = currentSettings[ i ]; TBool found = EFalse; @@ -287,9 +315,9 @@ if ( !found ) { // not found, get setting from backup - settingsFromBackUp.Append( currentInfo ); + settingsFromBackUp.AppendL( currentInfo ); currentSettings.Remove( i ); - i--; + --i; } else { @@ -312,12 +340,14 @@ // add settings from backup to settings for ( TInt i = 0; i < settingsFromBackUp.Count(); i++ ) { - aPsmConfigArray.Append( settingsFromBackUp[ i ] ); + //Ignore the error returned by Append + aPsmConfigArray.Append( settingsFromBackUp[ i ]); } // Cleanup config arrays CleanupStack::PopAndDestroy( &settingsFromBackUp ); CleanupStack::PopAndDestroy( &settingsToBackUp ); + CleanupStack::Pop( iBackupStorage ); CleanupStack::PopAndDestroy( ¤tSettings ); User::LeaveIfError( err ); @@ -348,15 +378,19 @@ CleanupClosePushL( psmConfigArray ); const TUint32 repository = passiveConfigs[i]; - + //Close Cenrep handler in case of any error + CleanupStack::PushL(TCleanupItem(CleanupStorage, iCenRepStorage)); iCenRepStorage->InitStorageL( repository ); if ( EPsmsrvModeNormal == iMode ) { + //Close Cenrep handler in case of any error + CleanupStack::PushL(TCleanupItem(CleanupBackupStorage, iBackupStorage)); // Moving to normal mode, get passive config set from baskup storage iBackupStorage->InitStorageL( repository ); iBackupStorage->ListPassiveConfigSetL( psmConfigArray ); iBackupStorage->CloseStorageL(); + CleanupStack::Pop( iBackupStorage ); } else { @@ -369,6 +403,7 @@ // close storage iCenRepStorage->CloseStorageL(); + CleanupStack::Pop( iCenRepStorage ); CleanupStack::PopAndDestroy( &psmConfigArray ); } diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/engine/psmstorage.cpp --- a/psmservices/psmserver/src/engine/psmstorage.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/engine/psmstorage.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -204,7 +204,7 @@ } // Add info to list - aPsmConfigArray.Append( configInfo ); + aPsmConfigArray.AppendL( configInfo ); // handle next element set setElement = nodeList.Next().AsElement(); diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/server/psmsrvmessage.cpp --- a/psmservices/psmserver/src/server/psmsrvmessage.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/server/psmsrvmessage.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -154,4 +154,13 @@ COMPONENT_TRACE( ( _L( "PSM Server - CPsmMessage::NotifyPsmModeChangeComplete - return" ) ) ); } +// ----------------------------------------------------------------------------- +// CPsmMessage::MessageHandle +// ----------------------------------------------------------------------------- +// +TInt CPsmMessage::MessageHandle() const + { + return iMessage.Handle(); + } + // End of file diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/src/server/psmsrvsession.cpp --- a/psmservices/psmserver/src/server/psmsrvsession.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/src/server/psmsrvsession.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -14,7 +14,8 @@ * Description: PSM Server session * */ - +#include +#include #include #include #include @@ -111,9 +112,6 @@ COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::~CPsmSession - No pending requests") ) ); } - // Reset and close config array - iConfigArray.Reset(); - iConfigArray.Close(); COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::~CPsmSession - return") ) ); } @@ -125,41 +123,28 @@ void CPsmSession::ServiceL( const RMessage2& aMessage ) { COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::ServiceL()" ) ) ); - - TRAPD( error, DispatchL( aMessage ) ); - - // Complete message with error code if there were errors - if ( KErrNone != error ) - { - COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::ServiceL() - Error: %i" ), error ) ); - aMessage.Complete( error ); - } - - COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::ServiceL - return" ) ) ); - } - -// ----------------------------------------------------------------------------- -// CPsmSession::DispatchL -// ----------------------------------------------------------------------------- -// -void CPsmSession::DispatchL( const RMessage2& aMessage ) - { - COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::DispatchL()" ) ) ); - switch ( aMessage.Function() ) { case EPsmServerNotifyModeChange: // For power save mode change { TInt mode = aMessage.Int0(); - if ( !iNotifyModeMessage ) - { - // Create message wrapper if not yet created - iNotifyModeMessage = CPsmMessage::NewL( iPsmManager ); - iPsmManager.RegisterObserver( iNotifyModeMessage ); - } - - // Check that mode to be set is valid, otherwise error code. - if( mode == iPsmManager.SettingsProvider().Mode() ) + if ( !iNotifyModeMessage ) + { + // Create message wrapper if not yet created + CPsmMessage* notifyModeMessage = CPsmMessage::NewL( iPsmManager ); + CleanupStack::PushL(notifyModeMessage); + iPsmManager.RegisterObserverL( notifyModeMessage ); + CleanupStack::Pop(notifyModeMessage); + iNotifyModeMessage = notifyModeMessage; + } + + //Check whether the mode is already set . + TInt cenrepMode( 0 ); + CRepository* cenrep = CRepository::NewLC( KCRUidPowerSaveMode ); + User::LeaveIfError(cenrep->Get( KPsmCurrentMode, cenrepMode )); + CleanupStack::PopAndDestroy( cenrep ); + // Check that mode to be set is valid, otherwise error code. + if( mode == cenrepMode ) { User::Leave( KErrAlreadyExists ); } @@ -188,12 +173,6 @@ case EPsmServerGetSettings: // For PSM settings case EPsmServerBackupSettings: // For PSM settings { - // Check previous config - if ( iConfigArray.Count() > 0 ) - { - iConfigArray.Reset(); - } - // Handle settings requests in different function HandleSettingsRequestL( aMessage ); break; @@ -224,8 +203,11 @@ if ( !iNotifyModeMessage ) { // Create message wrapper if not yet created - iNotifyModeMessage = CPsmMessage::NewL( iPsmManager ); - iPsmManager.RegisterObserver( iNotifyModeMessage ); + CPsmMessage* notifyModeMessage = CPsmMessage::NewL( iPsmManager ); + CleanupStack::PushL(notifyModeMessage); + iPsmManager.RegisterObserverL( notifyModeMessage ); + CleanupStack::Pop(notifyModeMessage); + iNotifyModeMessage = notifyModeMessage; } iNotifyModeMessage->Initialize( aMessage ); break; @@ -247,16 +229,78 @@ aMessage.Complete( KErrNone ); break; } +#ifdef _DEBUG + case EDebugHeapMark: + { + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession - EDebugMarkHeap: Alloc Cells: %d."), User::CountAllocCells())); + __UHEAP_MARK; + aMessage.Complete(KErrNone); + break; + } + + case EDebugHeapMarkEnd: + { + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession - EDebugMarkHeapEnd: Alloc Cells: %d."), User::CountAllocCells())); + if ( iNotifyModeMessage ) + { + // Unregister observer from manager + iPsmManager.UnregisterObserver( iNotifyModeMessage ); + // Compress the observer array + iPsmManager.CompressModeObserversArray(); + // Finally delete message + delete iNotifyModeMessage; + iNotifyModeMessage = NULL; + } + iPsmManager.ClosePluginLoader(); + __UHEAP_MARKEND; + aMessage.Complete(KErrNone); + break; + } + + case EDebugSetHeapFailure: + { + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession - EDebugSetHeapFailure: Value of Failure Rate: %d."), aMessage.Int0())); + __UHEAP_SETFAIL(RAllocator::EFailNext,aMessage.Int0()); + aMessage.Complete(KErrNone); + break; + } + + case EDebugHeapReset: + { + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession - EDebugHeapReset "))); + __UHEAP_RESET; + aMessage.Complete(KErrNone); + break; + } +#endif default: { COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::ServiceL() - unknown request: %i - ERROR" ), aMessage.Function() ) ); User::Leave( KErrUnknown ); } } + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::ServiceL - return" ) ) ); + } - COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::DispatchL - return" ) ) ); +// ----------------------------------------------------------------------------- +// CPsmSession::ServiceError +// ----------------------------------------------------------------------------- +// +void CPsmSession::ServiceError(const RMessage2 &aMessage, TInt aError) + { + // Complete message with error code if there were errors + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::ServiceError() - Error: %i" ), aError ) ); + if (iNotifyModeMessage && (aMessage.Handle() == iNotifyModeMessage->MessageHandle()) ) + { + iNotifyModeMessage->Complete( aError ); + } + else + { + aMessage.Complete( aError ); + } } + // ----------------------------------------------------------------------------- // CPsmSession::HandleSettingsRequestL // ----------------------------------------------------------------------------- @@ -265,37 +309,62 @@ { COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL()" ) ) ); + RConfigInfoArray configArray; + CleanupClosePushL(configArray); // read config array from message - ReadConfigArrayL( iConfigArray, aMessage ); + ReadConfigArrayL( configArray, aMessage ); // Get storage UID TUint32 storage = aMessage.Int2(); TInt err( KErrNone ); - if ( aMessage.Function() == EPsmServerBackupSettings ) + switch ( aMessage.Function() ) { - iPsmManager.SettingsProvider().BackupSettingsL( iConfigArray, storage ); - } - else - { - if ( aMessage.Function() == EPsmServerGetSettings ) + case EPsmServerBackupSettings: // For server backup settings { - iPsmManager.SettingsProvider().GetSettingsL( iConfigArray, storage ); + iPsmManager.SettingsProvider().BackupSettingsL( configArray, storage ); + break; } - else + case EPsmServerGetSettings: // For getting server settingspower save mode change { - // EPsmServerChangeSettings - iPsmManager.SettingsProvider().BackupAndGetSettingsL( iConfigArray, storage ); + iPsmManager.SettingsProvider().GetSettingsL( configArray, storage ); + // check whether the configArray is empty before writing the value back to message. + if(configArray.Count() > 0) + { + // write changed values back to message + TInt arraySize( configArray.Count() * sizeof( TPsmsrvConfigInfo ) ); + TPtr8 arrayPtr( reinterpret_cast(&configArray[0]), arraySize, arraySize ); + err = aMessage.Write( 0, arrayPtr ); + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL - New data wrote to message: %i" ), err ) ); + } + else + { + ERROR_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL - Config Array is Empty" )) ); + } + break; } - - // We have to write changed values back to message - TInt arraySize( iConfigArray.Count() * sizeof( TPsmsrvConfigInfo ) ); - TPtr8 arrayPtr( reinterpret_cast(&iConfigArray[0]), arraySize, arraySize ); - err = aMessage.Write( 0, arrayPtr ); - ERROR_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL - New data wrote to message: %i" ), err ) ); + case EPsmServerChangeSettings: // For changing the settings + { + // We have to write changed values back to message + iPsmManager.SettingsProvider().BackupAndGetSettingsL( configArray, storage ); + // We have to write changed values back to message + TInt arraySize( configArray.Count() * sizeof( TPsmsrvConfigInfo ) ); + TPtr8 arrayPtr( reinterpret_cast(&configArray[0]), arraySize, arraySize ); + err = aMessage.Write( 0, arrayPtr ); + ERROR_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL - New data wrote to message: %i" ), err ) ); + break; + } + default: + { + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL() - unknown request: %i - ERROR" ), aMessage.Function() ) ); + User::Leave( KErrUnknown ); + } } // Complete message before destroying local config array aMessage.Complete( err ); + + CleanupStack::PopAndDestroy(&configArray); + COMPONENT_TRACE( ( _L( "PSM Server - CPsmSession::HandleSettingsRequestL - return" ) ) ); } @@ -310,10 +379,8 @@ const TInt configCount( aMessage.Int1() ); TInt arrayLength( configCount * sizeof( TPsmsrvConfigInfo ) ); - // There is no ResizeL() for RArray - // ReserveL() does not change iCount, which will - // result array[0] failure (access beyond array index) - // That is why we fill the array with dummy items + aArray.ReserveL(configCount); + //Fill the array with dummy items for(TInt x = 0; x < configCount; ++x ) { // Append empty config infos to array diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/tsrc/PsmTestModule/conf/PsmTestModule.cfg --- a/psmservices/psmserver/tsrc/PsmTestModule/conf/PsmTestModule.cfg Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/tsrc/PsmTestModule/conf/PsmTestModule.cfg Thu Sep 02 21:48:26 2010 +0300 @@ -648,3 +648,51 @@ delete test [Endtest] +[Test] +title OOM_PSM to power save mode +create PsmTestModule test +test OOMChangePsmInit FullPsm +test ChangePsmEnd +delete test +[Endtest] + +[Test] +title OOM_Cancel PSM change +create PsmTestModule test +test OOMCancelPsm +pause 1000 +test ChangePsmEnd +delete test +[Endtest] + +[Test] +title OOM_BackupAndGetSettings +create PsmTestModule test +test ChangeSettingsInit Normal +test OOMBackupAndGetSettings +pause 1000 +test ChangePsmEnd +delete test +[Endtest] + +[Test] +title OOM_GetSettings +create PsmTestModule test +test ChangeSettingsInit Normal +test OOMGetSettings +pause 1000 +test ChangePsmEnd +delete test +[Endtest] + +[Test] +title OOM_BackupSettings +create PsmTestModule test +test ChangeSettingsInit Normal +test OOMBackupSettings +pause 1000 +test ChangePsmEnd +delete test +[Endtest] + + diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/tsrc/PsmTestModule/group/PsmTestModule.mmp --- a/psmservices/psmserver/tsrc/PsmTestModule/group/PsmTestModule.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/tsrc/PsmTestModule/group/PsmTestModule.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -37,6 +37,8 @@ //RESOURCE resource_file2 USERINCLUDE ../inc +USERINCLUDE ../../../inc/client +USERINCLUDE ../../../inc/util OS_LAYER_SYSTEMINCLUDE diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/tsrc/PsmTestModule/inc/PSMTest.h --- a/psmservices/psmserver/tsrc/PsmTestModule/inc/PSMTest.h Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/tsrc/PsmTestModule/inc/PSMTest.h Thu Sep 02 21:48:26 2010 +0300 @@ -266,6 +266,13 @@ // From MPsmChangeCompleteObserver virtual void PowerSaveModeChangeError( const TInt aError ); +#ifdef _DEBUG + TInt OOMNotifyPowerSaveModeChangeInitL( CStifItemParser& aItem ); + TInt OOMCancelPowerSaveModeChangeL( CStifItemParser& aItem ); + TInt OOMPsmBackupAndGetSettingsL( CStifItemParser& /*aItem*/ ); + TInt OOMPsmGetSettingsL( CStifItemParser& /*aItem*/ ); + TInt OOMPsmBackupSettingsL( CStifItemParser& /*aItem*/ ); +#endif //_DEBUG public: // Data // ?one_line_short_description_of_data diff -r 072a9626b290 -r 09d657f1ee00 psmservices/psmserver/tsrc/PsmTestModule/src/PSMTestBlocks.cpp --- a/psmservices/psmserver/tsrc/PsmTestModule/src/PSMTestBlocks.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/psmservices/psmserver/tsrc/PsmTestModule/src/PSMTestBlocks.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -28,7 +28,7 @@ #include #include - +#include "psmclientimpl.h" #include "PSMTest.h" @@ -126,7 +126,16 @@ ENTRY( "OpenClosePerformanceChange", CPSMTest::OpenClosePerformanceChange ), ENTRY( "OpenClosePerformanceEnd", CPSMTest::OpenClosePerformanceEnd ), ENTRY( "ChangePsmPerformance", CPSMTest::ChangePsmPerformance ), - ENTRY( "ChangeSettingsPerformance", CPSMTest::ChangeSettingsPerformance ) + +#ifdef _DEBUG + //OOM tests for psm server + ENTRY( "OOMChangePsmInit", CPSMTest::OOMNotifyPowerSaveModeChangeInitL ), + ENTRY( "OOMCancelPsm", CPSMTest::OOMCancelPowerSaveModeChangeL ), + ENTRY( "OOMBackupAndGetSettings", CPSMTest::OOMPsmBackupAndGetSettingsL ), + ENTRY( "OOMGetSettings", CPSMTest::OOMPsmGetSettingsL ), + ENTRY( "OOMBackupSettings", CPSMTest::OOMPsmBackupSettingsL ), +#endif //_DEBUG + ENTRY( "ChangeSettingsPerformance", CPSMTest::ChangeSettingsPerformance ) }; const TInt count = sizeof( KFunctions ) / @@ -1242,6 +1251,160 @@ // CPSMTestObserver::~CPSMTestObserver() { - } + } */ +#ifdef _DEBUG +// ----------------------------------------------------------------------------- +// CPSMTest::OOMNotifyPowerSaveModeChangeInit +// ----------------------------------------------------------------------------- +// +TInt CPSMTest::OOMNotifyPowerSaveModeChangeInitL(CStifItemParser& /*aItem*/) + { + CPsmClient* psmClient = CPsmClient::NewL( *this ); + CleanupStack::PushL(psmClient); + CPsmClientImpl* psmImpl = static_cast (psmClient); + psmImpl->HeapReset(); + psmImpl->HeapMark(); + for (TInt allocFailRate = 1;; allocFailRate++) + { + psmImpl->SetHeapFailure( allocFailRate ); + psmImpl->ChangePowerSaveMode(1); + // Wait for mode to change + iSchedulerWait.Start(); + + if (iErrorCode == KErrNone) + { + iErrorCode = KErrNone; + break; + } + } + psmImpl->HeapMarkEnd(); + psmImpl->HeapReset(); + CleanupStack::PopAndDestroy(psmClient); + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CPSMTest::OOMCancelPowerSaveModeChange +// ----------------------------------------------------------------------------- +// +TInt CPSMTest::OOMCancelPowerSaveModeChangeL( CStifItemParser& /*aItem*/ ) + { + CPsmClient* psmClient = CPsmClient::NewL( *this ); + CleanupStack::PushL(psmClient); + CPsmClientImpl* psmImpl = static_cast (psmClient); + psmImpl->ChangePowerSaveMode(0); + for (TInt allocFailRate = 1;; allocFailRate++) + { + psmImpl->HeapReset(); + psmImpl->SetHeapFailure( allocFailRate ); + psmImpl->HeapMark(); + psmImpl->CancelPowerSaveModeChange(); + // Wait for mode to change + iSchedulerWait.Start(); + psmImpl->HeapMarkEnd(); + if (iErrorCode == KErrNone ) + { + iErrorCode = KErrNone; + psmImpl->HeapReset(); + break; + } + } + CleanupStack::PopAndDestroy(psmClient); + return KErrNone; + } + + +// ----------------------------------------------------------------------------- +// CPSMTest::OOMPsmBackupAndGetSettings +// ----------------------------------------------------------------------------- +// +TInt CPSMTest::OOMPsmBackupAndGetSettingsL( CStifItemParser& /*aItem*/ ) + { + CPsmClient* psmClient = CPsmClient::NewL( *this ); + CleanupStack::PushL(psmClient); + + CPsmClientImpl* psmImpl = static_cast (psmClient); + psmImpl->HeapReset(); + psmImpl->HeapMark(); + for (TInt allocFailRate = 1;; allocFailRate++) + { + + psmImpl->SetHeapFailure( allocFailRate ); + + TInt err = psmImpl->PsmSettings().BackupAndGetSettings( iPsmConfigArray, KCenRepUid2 ); + + if (err == KErrNone) + { + + break; + } + } + psmImpl->HeapMarkEnd(); + psmImpl->HeapReset(); + CleanupStack::PopAndDestroy(psmClient); + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CPSMTest::OOMPsmGetSettings +// ----------------------------------------------------------------------------- +// +TInt CPSMTest::OOMPsmGetSettingsL( CStifItemParser& /*aItem*/ ) + { + CPsmClient* psmClient = CPsmClient::NewL( *this ); + CleanupStack::PushL(psmClient); + CPsmClientImpl* psmImpl = static_cast (psmClient); + + for (TInt allocFailRate = 1;; allocFailRate++) + { + psmImpl->HeapReset(); + psmImpl->SetHeapFailure( allocFailRate ); + psmImpl->HeapMark(); + TInt err = psmImpl->PsmSettings().GetSettings( iPsmConfigArray, KCenRepUid2 ); + psmImpl->HeapMarkEnd(); + if (err == KErrNone) + { + psmImpl->HeapReset(); + break; + } + } + CleanupStack::PopAndDestroy(psmClient); + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CPSMTest::OOMPsmBackupSettings +// ----------------------------------------------------------------------------- +// +TInt CPSMTest::OOMPsmBackupSettingsL( CStifItemParser& /*aItem*/ ) + { + CPsmClient* psmClient = CPsmClient::NewL( *this ); + CleanupStack::PushL(psmClient); + CPsmClientImpl* psmImpl = static_cast (psmClient); + //IGNORE the error of Powersave mode request. If Powersave mode is not enabled the Backupsettings will fail with KErrWrite. + psmImpl->ChangePowerSaveMode(1); + iSchedulerWait.Start(); + RConfigInfoArray psmConfigArray; + GenerateConfigArray( psmConfigArray, EPsmsrvModePowerSave, 0 ); + psmImpl->HeapReset(); + psmImpl->HeapMark(); + for (TInt allocFailRate = 1;; allocFailRate++) + { + psmImpl->SetHeapFailure( allocFailRate ); + TInt err = psmImpl->PsmSettings().BackupSettings( psmConfigArray, KCenRepUid2 ); + iLog->Log( _L("PSMTest: BackupSettings- iPsmConfigArray.Count(): %d"), psmConfigArray.Count() ); + if (err == KErrNone) + { + break; + } + } + psmImpl->HeapMarkEnd(); + psmImpl->HeapReset(); + psmConfigArray.Close(); + CleanupStack::PopAndDestroy(psmClient); + return KErrNone; + } + +#endif //_DEBUG // End of File diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/data/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/resourcemgmt/data/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,29 @@ +/* +* Copyright (c) 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: Hardware Resource Manager data files +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS +InternalHWRMLightsPolicy.ini z:/private/101f7a02/customerhwrmlightspolicy.ini +InternalHWRMVibraPolicy.ini z:/private/101f7a02/customerhwrmvibrapolicy.ini +InternalHWRMFmTxPolicy.ini z:/private/101f7a02/customerhwrmfmtxpolicy.ini + + +// End of File diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/group/bld.inf --- a/resourcemgmt/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/group/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -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" @@ -21,22 +21,13 @@ DEFAULT PRJ_EXPORTS -../data/InternalHWRMLightsPolicy.ini z:/private/101f7a02/customerhwrmlightspolicy.ini -../data/InternalHWRMVibraPolicy.ini z:/private/101f7a02/customerhwrmvibrapolicy.ini -../data/InternalHWRMFmTxPolicy.ini z:/private/101f7a02/customerhwrmfmtxpolicy.ini - +#include "../data/bld.inf" #include "../hwresourcesmgr/group/bld.inf" #include "../hwresourcesmgrconfig/bld.inf" #include "../powerandmemorynotificationservice/group/bld.inf" #include "../hwrmfmtxwatcherplugin/group/bld.inf" - -#if defined(WINSCW) && !defined(__HWRM_TARGET_MODIFIER_PLUGIN) -// Do nothing -#else #include "../hwrmtargetmodifierplugin/group/bld.inf" -#endif - #include "../vibractrl/group/bld.inf" // End of File diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/group/HWResourceManager.iby --- a/resourcemgmt/hwresourcesmgr/group/HWResourceManager.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/group/HWResourceManager.iby Thu Sep 02 21:48:26 2010 +0300 @@ -21,13 +21,13 @@ #include // Feature Registry (featreg.dll) -file=ABI_DIR\DEBUG_DIR\HWRMCommon.dll SYSTEM_BINDIR\HWRMCommon.dll -file=ABI_DIR\DEBUG_DIR\HWRMServer.exe SYSTEM_BINDIR\HWRMServer.exe -file=ABI_DIR\DEBUG_DIR\HWRMClient.dll SYSTEM_BINDIR\HWRMClient.dll -file=ABI_DIR\DEBUG_DIR\HWRMVibraClient.dll SYSTEM_BINDIR\HWRMVibraClient.dll -file=ABI_DIR\DEBUG_DIR\HWRMLightClient.dll SYSTEM_BINDIR\HWRMLightClient.dll -file=ABI_DIR\DEBUG_DIR\HWRMExtendedLightClient.dll SYSTEM_BINDIR\HWRMExtendedLightClient.dll -file=ABI_DIR\DEBUG_DIR\HWRMPowerClient.dll SYSTEM_BINDIR\HWRMPowerClient.dll +file=ABI_DIR\DEBUG_DIR\hwrmcommon.dll SYSTEM_BINDIR\hwrmcommon.dll +file=ABI_DIR\DEBUG_DIR\hwrmserver.exe SYSTEM_BINDIR\hwrmserver.exe +file=ABI_DIR\DEBUG_DIR\hwrmclient.dll SYSTEM_BINDIR\hwrmclient.dll +file=ABI_DIR\DEBUG_DIR\hwrmvibraclient.dll SYSTEM_BINDIR\hwrmvibraclient.dll +file=ABI_DIR\DEBUG_DIR\hwrmlightclient.dll SYSTEM_BINDIR\hwrmlightclient.dll +file=ABI_DIR\DEBUG_DIR\hwrmextendedlightclient.dll SYSTEM_BINDIR\hwrmextendedlightclient.dll +file=ABI_DIR\DEBUG_DIR\hwrmpowerclient.dll SYSTEM_BINDIR\hwrmpowerclient.dll // Backup and Restore data=DATAZ_\private\101f7a02\backup_registration.xml private\101f7a02\backup_registration.xml @@ -37,17 +37,17 @@ //Product specific policy files, customized on a per product basis, depending on the device requirements. //Product specific policy overrides customer specific policy, if same SID is defined in both policies. -data=DATAZ_\private\101f7a02\ProductHWRMLightsPolicy.ini private\101f7a02\ProductHWRMLightsPolicy.ini -data=DATAZ_\private\101f7a02\ProductHWRMVibraPolicy.ini private\101f7a02\ProductHWRMVibraPolicy.ini -data=DATAZ_\private\101f7a02\ProductHWRMFmTxPolicy.ini private\101f7a02\ProductHWRMFmTxPolicy.ini +data=DATAZ_\private\101f7a02\producthwrmlightspolicy.ini private\101f7a02\producthwrmlightspolicy.ini +data=DATAZ_\private\101f7a02\producthwrmvibrapolicy.ini private\101f7a02\producthwrmvibrapolicy.ini +data=DATAZ_\private\101f7a02\producthwrmfmtxpolicy.ini private\101f7a02\producthwrmfmtxpolicy.ini //Platform internal policies (customer specific), customized by licensees to control policy at a platform level. -data=DATAZ_\private\101f7a02\CustomerHWRMLightsPolicy.ini private\101f7a02\CustomerHWRMLightsPolicy.ini -data=DATAZ_\private\101f7a02\CustomerHWRMVibraPolicy.ini private\101f7a02\CustomerHWRMVibraPolicy.ini -data=DATAZ_\private\101f7a02\CustomerHWRMFmTxPolicy.ini private\101f7a02\CustomerHWRMFmTxPolicy.ini +data=DATAZ_\private\101f7a02\customerhwrmlightspolicy.ini private\101f7a02\customerhwrmlightspolicy.ini +data=DATAZ_\private\101f7a02\customerhwrmvibrapolicy.ini private\101f7a02\customerhwrmvibrapolicy.ini +data=DATAZ_\private\101f7a02\customerhwrmfmtxpolicy.ini private\101f7a02\customerhwrmfmtxpolicy.ini // FM Tx RDS text conversion -data=DATAZ_\private\101f7a02\ConvertFromUnicode.dat private\101f7a02\ConvertFromUnicode.dat +data=DATAZ_\private\101f7a02\convertfromunicode.dat private\101f7a02\convertfromunicode.dat #endif // __HWRESOURCEMANAGER_IBY__ diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/server/inc/HWRMPluginHandler.h --- a/resourcemgmt/hwresourcesmgr/server/inc/HWRMPluginHandler.h Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/server/inc/HWRMPluginHandler.h Thu Sep 02 21:48:26 2010 +0300 @@ -148,7 +148,7 @@ * * @param aCallback The indication handler to be registered */ - void RegisterForIndications(MHWRMIndicationHandler* aCallback); + void RegisterForIndicationsL(MHWRMIndicationHandler* aCallback); /** * Deregisters handlers for receiving HWRM plug-in indications diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/server/src/HWRMPluginHandler.cpp --- a/resourcemgmt/hwresourcesmgr/server/src/HWRMPluginHandler.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMPluginHandler.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -328,11 +328,11 @@ // Registers a handler for receiving HWRM plug-in indications // ----------------------------------------------------------------------------- // -void CHWRMPluginHandler::RegisterForIndications(MHWRMIndicationHandler* aCallback) +void CHWRMPluginHandler::RegisterForIndicationsL(MHWRMIndicationHandler* aCallback) { - COMPONENT_TRACE2( _L( "HWRM Server - CHWRMPluginHandler::RegisterForIndications(), Count() = %d" ), iIndicationCallbacks.Count() ); + COMPONENT_TRACE2( _L( "HWRM Server - CHWRMPluginHandler::RegisterForIndicationsL(), Count() = %d" ), iIndicationCallbacks.Count() ); - iIndicationCallbacks.Append(aCallback); + iIndicationCallbacks.AppendL(aCallback); } // ----------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp --- a/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -113,7 +113,7 @@ COMPONENT_TRACE2(_L( "HWRM Server - CHWRMPowerCommonData::ConstructL - iMaximumReportingPeriod: %d" ), iMaximumReportingPeriod ); // Register for indications from HWRM plugin. - aPluginHandler->RegisterForIndications(this); + aPluginHandler->RegisterForIndicationsL(this); iPowerService = CHWRMPowerService::NewL(aPluginHandler, *this); diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/server/src/HWRMServer.cpp --- a/resourcemgmt/hwresourcesmgr/server/src/HWRMServer.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMServer.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -737,12 +737,12 @@ iFmTxCommonData = NULL; iFmTxCommonData = CHWRMFmTxCommonData::NewL(); - iFmTxPluginHandler->RegisterForIndications(iFmTxCommonData); + iFmTxPluginHandler->RegisterForIndicationsL(iFmTxCommonData); iFmTxStateUtility = CHWRMFmTxStateUtility::NewL(iFmTxPluginHandler, iFmTxWatcherPluginHandler, iFmTxReservationHandler, iFmTxCommonData); - iFmTxWatcherPluginHandler->RegisterForIndications(iFmTxStateUtility); + iFmTxWatcherPluginHandler->RegisterForIndicationsL(iFmTxStateUtility); } else { diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/TestCapsHWRMPolicing/group/Cap_HWRM_API_Policing.mmp --- a/resourcemgmt/hwresourcesmgr/test/TestCapsHWRMPolicing/group/Cap_HWRM_API_Policing.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/TestCapsHWRMPolicing/group/Cap_HWRM_API_Policing.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -48,16 +48,7 @@ SOURCE HWRMFmTxSetRdsPty_CStep.cpp SOURCE HWRMFmTxSetRdsPtyn_CStep.cpp -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -SYSTEMINCLUDE /epoc32/include/test -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/test - -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/test -SYSTEMINCLUDE /epoc32/include/hwrm -#endif +OS_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc USERINCLUDE ../../../include diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/TestCapsHWRMPolicing/inc/CSuite.h --- a/resourcemgmt/hwresourcesmgr/test/TestCapsHWRMPolicing/inc/CSuite.h Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/TestCapsHWRMPolicing/inc/CSuite.h Thu Sep 02 21:48:26 2010 +0300 @@ -24,8 +24,8 @@ #include #include "f32file.h" #include "e32test.h" -#include -#include +#include +#include //The two ways to get thru #define API_RetValue_ServerPanic 0 diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/group/howto_test_hwrm.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/resourcemgmt/hwresourcesmgr/test/group/howto_test_hwrm.txt Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,32 @@ +Steps to test HWRM +------------------------------ +- Change to \sf\os\devicesrv\resourcemgmt\hwresourcesmgr\test\group directory +- Build test code by executing 'sbs -c armv5.test' (for armv5 target) +- Include te_hwrm.iby file in the rom build by adding the following line in + SymbianOS.iby (one such file which is included in rom building) + + #include + +Note: There are certain test specific cenrep files that we export from within + this test code. They might get overridden on certain platforms such as + platsim by the crml files export as part of production code. They should + be removed by manually deletion. List of those crml files is as follows: + + Exported from \sf\os\devicesrv\resourcemgmt\hwresourcesmgrconfig\conf + 1. hwresourcesandenhancements_10200C8B.crml + 2. hwresourcesandenhancements_10200C8C.crml + 3. hwresourcesandenhancements_10200C8D.crml + 4. hwresourcesandenhancements_10205043.crml + + Exported from \sf\os\devicesrv\resourceinterfaces\fmtransmittercontrol\conf + 5. hwresourceclientfmtx_20008EA6.crml + +Command to run HWRM tests +------------------------------ +- After booting the built rom image, switch to eshell +- For the TEF tests, run the command + testexecute z:\testdata\scripts\te_hwrm.script + +- There are additional RTests, run the command + hwrmtests.exe + diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/multiclient/HWRMLightTestB/group/HWRMLightTestB.mmp --- a/resourcemgmt/hwresourcesmgr/test/multiclient/HWRMLightTestB/group/HWRMLightTestB.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/multiclient/HWRMLightTestB/group/HWRMLightTestB.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -56,19 +56,21 @@ USERINCLUDE ../../common USERINCLUDE ../../McFramework -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/hwrm -SYSTEMINCLUDE /epoc32/include/libc -SYSTEMINCLUDE /epoc32/include/platform/app/techview -SYSTEMINCLUDE /epoc32/include/platform/app -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/hwrm -SYSTEMINCLUDE /epoc32/include/libc -SYSTEMINCLUDE /epoc32/include/techview -#endif +//This testsuite will be deprecated and for now as per the error ou1cimx1#480368, All system includes are commented. +//#ifndef SYMBIAN_OLD_EXPORT_LOCATION +//OS_LAYER_SYSTEMINCLUDE_SYMBIAN +//MW_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/platform/hwrm +//SYSTEMINCLUDE /epoc32/include/libc +//SYSTEMINCLUDE /epoc32/include/platform/app/techview +//SYSTEMINCLUDE /epoc32/include/platform/app +//#else +//SYSTEMINCLUDE /epoc32/include +//SYSTEMINCLUDE /epoc32/include/hwrm +//SYSTEMINCLUDE /epoc32/include/libc +//SYSTEMINCLUDE /epoc32/include/techview +//#endif + LIBRARY euser.lib apparc.lib cone.lib eikcore.lib LIBRARY eikcoctl.lib LIBRARY eikdlg.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/multiclient/HWRMLightTestF/group/HWRMLightTestF.mmp --- a/resourcemgmt/hwresourcesmgr/test/multiclient/HWRMLightTestF/group/HWRMLightTestF.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/multiclient/HWRMLightTestF/group/HWRMLightTestF.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -54,17 +54,18 @@ USERINCLUDE ../../common USERINCLUDE ../../McFramework -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/hwrm -SYSTEMINCLUDE /epoc32/include/libc -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/hwrm -SYSTEMINCLUDE /epoc32/include/libc -SYSTEMINCLUDE /epoc32/include/techview -#endif +// This testsuite will be deprecated and for now as per the error ou1cimx1#480368, All system includes are commented. +//#ifndef SYMBIAN_OLD_EXPORT_LOCATION +//OS_LAYER_SYSTEMINCLUDE_SYMBIAN +//MW_LAYER_SYSTEMINCLUDE_SYMBIAN +//SYSTEMINCLUDE /epoc32/include/platform/hwrm +//SYSTEMINCLUDE /epoc32/include/libc +//#else +//SYSTEMINCLUDE /epoc32/include +//SYSTEMINCLUDE /epoc32/include/hwrm +//SYSTEMINCLUDE /epoc32/include/libc +//SYSTEMINCLUDE /epoc32/include/techview +//#endif LIBRARY euser.lib apparc.lib cone.lib eikcore.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/multiclient/common/testcasecontroller.h --- a/resourcemgmt/hwresourcesmgr/test/multiclient/common/testcasecontroller.h Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/multiclient/common/testcasecontroller.h Thu Sep 02 21:48:26 2010 +0300 @@ -20,10 +20,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include "McFramework.h" #include "tc_log.h" #include "testcaseids.h" diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/multiclient/hwrmtests/hwrmtests.mmp --- a/resourcemgmt/hwresourcesmgr/test/multiclient/hwrmtests/hwrmtests.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/multiclient/hwrmtests/hwrmtests.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -34,14 +34,9 @@ USERINCLUDE ../common USERINCLUDE ../McFramework -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/hwrm -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/hwrm -#endif +OS_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE + LIBRARY centralrepository.lib LIBRARY euser.lib LIBRARY efsrv.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/multiclient/mctest_b/mctest_b.mmp --- a/resourcemgmt/hwresourcesmgr/test/multiclient/mctest_b/mctest_b.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/multiclient/mctest_b/mctest_b.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -34,14 +34,8 @@ USERINCLUDE ../common USERINCLUDE ../McFramework -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/hwrm -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/hwrm -#endif +OS_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY efsrv.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/multiclient/mctest_f/mctest_f.mmp --- a/resourcemgmt/hwresourcesmgr/test/multiclient/mctest_f/mctest_f.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/multiclient/mctest_f/mctest_f.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -34,14 +34,8 @@ USERINCLUDE ../common USERINCLUDE ../McFramework -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/hwrm -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/hwrm -#endif +OS_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE LIBRARY centralrepository.lib LIBRARY euser.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmDll/group/mockhwrm.mmp --- a/resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmDll/group/mockhwrm.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmDll/group/mockhwrm.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -20,8 +20,8 @@ CAPABILITY ALL -Tcb USERINCLUDE ../inc -SYSTEMINCLUDE /epoc32/include/ecom -OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +OS_LAYER_SYSTEMINCLUDE SOURCEPATH ../src diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmSY/group/mockhwrmsy.mmp --- a/resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmSY/group/mockhwrmsy.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmSY/group/mockhwrmsy.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -27,11 +27,8 @@ USERINCLUDE ../inc USERINCLUDE ../../MockHwrmDll/inc USERINCLUDE ../../../../../server/plugininc -SYSTEMINCLUDE /epoc32/include/ecom -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -SYSTEMINCLUDE /epoc32/include/hwrm -#endif + +OS_LAYER_SYSTEMINCLUDE SOURCEPATH ../src diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmSY/src/proxy.cpp --- a/resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmSY/src/proxy.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/MockHwrmSY/MockHwrmSY/src/proxy.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -14,7 +14,7 @@ // #include -#include +#include #include "cmocklightsy.h" #include "cmockvibrasy.h" #include "cmockfmtxsy.h" diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/fmtxwatcherplugin/group/hwrmfmtxwatcherplugin.mmp --- a/resourcemgmt/hwresourcesmgr/test/plugins/fmtxwatcherplugin/group/hwrmfmtxwatcherplugin.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/fmtxwatcherplugin/group/hwrmfmtxwatcherplugin.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -38,11 +38,8 @@ #endif // INSECURE_AUDIO_POLICY_KEYS USERINCLUDE ../inc -SYSTEMINCLUDE /epoc32/include/ecom -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -SYSTEMINCLUDE /epoc32/include/hwrm -#endif + +OS_LAYER_SYSTEMINCLUDE SOURCEPATH ../data START RESOURCE 20012401.rss diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/fmtxwatcherplugin/src/hwrmfmtxwatcherplugin.cpp --- a/resourcemgmt/hwresourcesmgr/test/plugins/fmtxwatcherplugin/src/hwrmfmtxwatcherplugin.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/fmtxwatcherplugin/src/hwrmfmtxwatcherplugin.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -16,7 +16,7 @@ #include -#include +#include #include "hwrmfmtxwatcherplugin.h" //#include "hwrmfmtxaccobserver.h" //#include "hwrmfmtxusbobserver.h" diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group/hwrmdefaultlighttargetmodifierplugin.mmp --- a/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group/hwrmdefaultlighttargetmodifierplugin.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group/hwrmdefaultlighttargetmodifierplugin.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -34,13 +34,8 @@ USERINCLUDE ../inc USERINCLUDE ../../../../include // telephony/hwrm/include -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/hwrm -SYSTEMINCLUDE /epoc32/include/featmgr -#endif +OS_LAYER_SYSTEMINCLUDE + LIBRARY euser.lib LIBRARY ecom.lib LIBRARY featmgr.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_b/group/hwrmtestuiplugin_b.mmp --- a/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_b/group/hwrmtestuiplugin_b.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_b/group/hwrmtestuiplugin_b.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -31,9 +31,7 @@ USERINCLUDE ../inc USERINCLUDE ../../../../common/inc - -SYSTEMINCLUDE /epoc32/include/ecom -OS_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY ecom.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_b/src/proxy.cpp --- a/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_b/src/proxy.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_b/src/proxy.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -14,7 +14,7 @@ // #include -#include +#include #include "hwrmtestuiplugin_b.h" // Map the interface implementation UIDs to implementation factory functions diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_f/group/hwrmtestuiplugin_f.mmp --- a/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_f/group/hwrmtestuiplugin_f.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_f/group/hwrmtestuiplugin_f.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -31,8 +31,7 @@ USERINCLUDE ../inc USERINCLUDE ../../../../common/inc -SYSTEMINCLUDE /epoc32/include/ecom -OS_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY ecom.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_f/src/proxy.cpp --- a/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_f/src/proxy.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/plugins/testuiplugin_f/src/proxy.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -14,7 +14,7 @@ // #include -#include +#include #include "hwrmtestuiplugin_f.h" // Map the interface implementation UIDs to implementation factory functions diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtest.cpp --- a/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtest.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtest.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -16,10 +16,10 @@ #include "hwrmtest.h" #include "hwrmtestmacros.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestbase.h --- a/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestbase.h Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestbase.h Thu Sep 02 21:48:26 2010 +0300 @@ -16,13 +16,13 @@ #ifndef hwrmtestbase_h #define hwrmtestbase_h -#include +#include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestserver.cpp --- a/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestserver.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestserver.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -13,8 +13,8 @@ // Description: // -#include -#include +#include +#include #include "hwrmtest.h" // Require: return server name : must be the same that the exe name diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestserver_pr.cpp --- a/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestserver_pr.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/te_hwrm/hwrmtestserver_pr.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -13,8 +13,8 @@ // Description: // -#include -#include +#include +#include #include "hwrmtest.h" // Require: return server name : must be the same that the exe name diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/te_hwrm/te_hwrm.mmp --- a/resourcemgmt/hwresourcesmgr/test/te_hwrm/te_hwrm.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/te_hwrm/te_hwrm.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -39,16 +39,8 @@ USERINCLUDE ../../client/inc USERINCLUDE ../../server/inc -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -SYSTEMINCLUDE /epoc32/include/test -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/test -SYSTEMINCLUDE /epoc32/include/platform/hwrm -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/test -SYSTEMINCLUDE /epoc32/include/hwrm -#endif +OS_LAYER_SYSTEMINCLUDE + STATICLIBRARY tefunit.lib LIBRARY euser.lib LIBRARY testexecuteutils.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgr/test/te_hwrm/te_hwrm_pr.mmp --- a/resourcemgmt/hwresourcesmgr/test/te_hwrm/te_hwrm_pr.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgr/test/te_hwrm/te_hwrm_pr.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -33,17 +33,7 @@ USERINCLUDE ../../include USERINCLUDE ../../server/inc -#ifndef SYMBIAN_OLD_EXPORT_LOCATION -SYSTEMINCLUDE /epoc32/include/test -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -SYSTEMINCLUDE /epoc32/include/platform/test -SYSTEMINCLUDE /epoc32/include/platform/hwrm -#else -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/test -SYSTEMINCLUDE /epoc32/include/hwrm -#endif - +OS_LAYER_SYSTEMINCLUDE STATICLIBRARY tefunit.lib LIBRARY euser.lib diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgrconfig/bld.inf --- a/resourcemgmt/hwresourcesmgrconfig/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwresourcesmgrconfig/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -34,3 +34,5 @@ ./conf/hwresourcesandenhancements_1020506A.crml OS_LAYER_EXPORTS_CRML(hwresourcesandenhancements_1020506a.crml) ./conf/hwresourcesandenhancements_10200C8D.crml OS_LAYER_EXPORTS_CRML(hwresourcesandenhancements_10200c8d.crml) +// Customization interface confml file +./conf/ci_hwresourcesandenhancements.confml OS_LAYER_EXPORTS_CONFML(ci_hwresourcesandenhancements.confml) diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgrconfig/conf/ci_hwresourcesandenhancements.confml Binary file resourcemgmt/hwresourcesmgrconfig/conf/ci_hwresourcesandenhancements.confml has changed diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwresourcesmgrconfig/conf/hwresourcesandenhancements.confml Binary file resourcemgmt/hwresourcesmgrconfig/conf/hwresourcesandenhancements.confml has changed diff -r 072a9626b290 -r 09d657f1ee00 resourcemgmt/hwrmtargetmodifierplugin/group/bld.inf --- a/resourcemgmt/hwrmtargetmodifierplugin/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/resourcemgmt/hwrmtargetmodifierplugin/group/bld.inf Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 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" @@ -15,6 +15,10 @@ * build information file * */ +#if defined(WINSCW) && !defined(__HWRM_TARGET_MODIFIER_PLUGIN) +// Do nothing +#else + #include PRJ_PLATFORMS @@ -26,5 +30,5 @@ PRJ_MMPFILES ../group/hwrmdefaultlighttargetmodifierplugin.mmp - +#endif // End of File diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/inc/OrientationCRListener.h --- a/sensorservices/orientationssy/inc/OrientationCRListener.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/inc/OrientationCRListener.h Thu Sep 02 21:48:26 2010 +0300 @@ -87,7 +87,7 @@ class MCenRepCallBack { public: - virtual void CreateConfigurations() = 0; + virtual TInt CreateConfigurations() = 0; }; #endif // ORIENTATIONCRLISTENER_H diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/inc/SsyOrientation.h --- a/sensorservices/orientationssy/inc/SsyOrientation.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/inc/SsyOrientation.h Thu Sep 02 21:48:26 2010 +0300 @@ -104,14 +104,14 @@ /** * Create configurations for angles and timers */ - void CreateConfigurations(); + TInt CreateConfigurations(); /** * Used for creating configuration for angle definitions * * @param aConfigurationForState the configuration to set. */ - void SetConfigurationForState( + TInt SetConfigurationForState( const TOrientationConfiguration& aConfigurationForState ); diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/src/OrientationCRListener.cpp --- a/sensorservices/orientationssy/src/OrientationCRListener.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/src/OrientationCRListener.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -91,7 +91,7 @@ SSY_TRACE( EExtended, "ORIENTATIONSSY:RunL::Key %d changed", iStatus.Int() ); iRepository->NotifyRequest( iStatus.Int(), iStatus ); - iCallBack.CreateConfigurations(); + User::LeaveIfError(iCallBack.CreateConfigurations()); if( !IsActive() ) { diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/src/SsyChannel.cpp --- a/sensorservices/orientationssy/src/SsyChannel.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/src/SsyChannel.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -208,7 +208,12 @@ // CSSYChannel::RunError() // ---------------------------------------------------------------------------------- // +#ifdef _DEBUG TInt CSSYChannel::RunError( TInt aError ) +#else +// not used in UREL builds +TInt CSSYChannel::RunError( TInt /*aError*/ ) +#endif { SSY_TRACE( EMust, "ORIENTATIONSSY:RunError %d", aError ); diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/src/SsyControlOrientation.cpp --- a/sensorservices/orientationssy/src/SsyControlOrientation.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/src/SsyControlOrientation.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -224,8 +224,8 @@ if ( channel ) { - iChannelArray.Append( channel ); - channelInfoList.Append( channelInfo ); + User::LeaveIfError(iChannelArray.Append( channel )); + User::LeaveIfError(channelInfoList.Append( channelInfo)); } } diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/src/SsyOrientation.cpp --- a/sensorservices/orientationssy/src/SsyOrientation.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/src/SsyOrientation.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -186,7 +186,7 @@ void CSSYOrientation::ConstructL() { iRepository = CRepository::NewL( KCRUidOrientationSsySettings ); - CreateConfigurations(); + User::LeaveIfError(CreateConfigurations()); #ifdef AUTO_ORIENTAION_TEST iCRListener = CSsyOrientationCRListener::NewL( *this, iRepository ); @@ -1090,11 +1090,13 @@ // CSSYOrientation::SetConfigurationForState() // ---------------------------------------------------------------------------------- // -void CSSYOrientation::SetConfigurationForState( +TInt CSSYOrientation::SetConfigurationForState( const TOrientationConfiguration& aConfigurationForState ) { SSY_TRACE_IN(); TBool wasFound( EFalse ); + TInt retVal( KErrNone ); + // Check if is in array for( TInt i = 0; i != iConfigArray.Count(); i++ ) { @@ -1102,15 +1104,17 @@ if( aConfigurationForState.iOrientationState == iConfigArray[ i ].iOrientationState ) { iConfigArray.Remove( i ); - iConfigArray.Insert( aConfigurationForState, i ); + retVal = iConfigArray.Insert( aConfigurationForState, i ); wasFound = ETrue; } } if( !wasFound ) { - iConfigArray.Append( aConfigurationForState ); + retVal = iConfigArray.Append( aConfigurationForState ); } + SSY_TRACE_OUT(); + return retVal; } // ---------------------------------------------------------------------------------- @@ -1139,11 +1143,12 @@ // CSSYOrientation::CreteConfigurations() // ---------------------------------------------------------------------------------- // -void CSSYOrientation::CreateConfigurations() +TInt CSSYOrientation::CreateConfigurations() { SSY_TRACE_IN(); TInt repValue( 0 ); + TInt retVal( KErrNone ); // This is used in initialisation if( iConfigForCurrentState.iOrientationState == TSensrvOrientationData::EOrientationUndefined ) @@ -1208,7 +1213,13 @@ SSY_TRACE( EExtended, "ORIENTATIONSSY:CreteConfigurations::EOrientationDisplayUp.iOrientationDisplayDownwards.iTimerValueInMilSeconds=%d", repValue ); configForDisplayUp.iOrientationDisplayDownwards.iTimerValueInMilSeconds = repValue; - SetConfigurationForState( configForDisplayUp ); + retVal = SetConfigurationForState( configForDisplayUp ); + if( retVal != KErrNone) + { + SSY_TRACE( EExtended, "ORIENTATIONSSY:SetConfigurationForState(configForDisplayUp)=%d", retVal); + SSY_TRACE_OUT(); + return retVal; + } // Configuration for display down TOrientationConfiguration configForDisplayDown; @@ -1256,7 +1267,14 @@ iRepository->Get( KOriStateDisplayDownToDisplayDownwardsTimerKey, repValue ); SSY_TRACE( EExtended, "ORIENTATIONSSY:CreteConfigurations::EOrientationDisplayDown.iOrientationDisplayDownwards.iTimerValueInMilSeconds=%d", repValue ); configForDisplayDown.iOrientationDisplayDownwards.iTimerValueInMilSeconds = repValue; - SetConfigurationForState( configForDisplayDown ); + + retVal = SetConfigurationForState( configForDisplayDown); + if( retVal != KErrNone) + { + SSY_TRACE( EExtended, "ORIENTATIONSSY:SetConfigurationForState(configForDisplayDown)=%d", retVal); + SSY_TRACE_OUT(); + return retVal; + } // Configuration for left up TOrientationConfiguration configForDisplayLeftUp; @@ -1304,7 +1322,14 @@ iRepository->Get( KOriStateDisplayLeftUpToDisplayDownwardsTimerKey, repValue ); SSY_TRACE( EExtended, "ORIENTATIONSSY:CreteConfigurations::EOrientationDisplayLeftUp.iOrientationDisplayDownwards.iTimerValueInMilSeconds=%d", repValue ); configForDisplayLeftUp.iOrientationDisplayDownwards.iTimerValueInMilSeconds = repValue; - SetConfigurationForState( configForDisplayLeftUp ); + + retVal = SetConfigurationForState( configForDisplayLeftUp ); + if( retVal != KErrNone) + { + SSY_TRACE( EExtended, "ORIENTATIONSSY:SetConfigurationForState(configForDisplayLeftUp)=%d", retVal); + SSY_TRACE_OUT(); + return retVal; + } // Configuration for right up TOrientationConfiguration configForDisplayRightUp; @@ -1352,7 +1377,14 @@ iRepository->Get( KOriStateDisplayRightUpToDisplayDownwardsTimerKey, repValue ); SSY_TRACE( EExtended, "ORIENTATIONSSY:CreteConfigurations::EOrientationDisplayRightUp.iOrientationDisplayDownwards.iTimerValueInMilSeconds=%d", repValue ); configForDisplayRightUp.iOrientationDisplayDownwards.iTimerValueInMilSeconds = repValue; - SetConfigurationForState( configForDisplayRightUp ); + + retVal = SetConfigurationForState( configForDisplayRightUp ); + if( retVal != KErrNone) + { + SSY_TRACE( EExtended, "ORIENTATIONSSY:SetConfigurationForState( configForDisplayRightUp)=%d", retVal); + SSY_TRACE_OUT(); + return retVal; + } // Configuration for upwards TOrientationConfiguration configForDisplayUpwards; @@ -1400,7 +1432,14 @@ iRepository->Get( KOriStateDisplayUpwardsToDisplayDownwardsTimerKey, repValue ); SSY_TRACE( EExtended, "ORIENTATIONSSY:CreteConfigurations::EOrientationDisplayUpwards.iOrientationDisplayDownwards.iTimerValueInMilSeconds=%d", repValue ); configForDisplayUpwards.iOrientationDisplayDownwards.iTimerValueInMilSeconds = repValue; - SetConfigurationForState( configForDisplayUpwards ); + + retVal = SetConfigurationForState( configForDisplayUpwards); + if( retVal != KErrNone) + { + SSY_TRACE( EExtended, "ORIENTATIONSSY:SetConfigurationForState( configForDisplayUpwards)=%d", retVal); + SSY_TRACE_OUT(); + return retVal; + } // Configuration for downwards TOrientationConfiguration configForDisplayDownwards; @@ -1450,7 +1489,14 @@ configForDisplayDownwards.iOrientationDisplayDownwards.iAngle = 0; configForDisplayDownwards.iOrientationDisplayDownwards.iTimerValueInMilSeconds = 0; - SetConfigurationForState( configForDisplayDownwards ); + + retVal = SetConfigurationForState( configForDisplayDownwards); + if( retVal != KErrNone) + { + SSY_TRACE( EExtended, "ORIENTATIONSSY:SetConfigurationForState( configForDisplayDownwards)=%d", retVal); + SSY_TRACE_OUT(); + return retVal; + } if( iConfigForCurrentState.iOrientationState != TSensrvOrientationData::EOrientationUndefined ) { @@ -1459,6 +1505,7 @@ } SSY_TRACE_OUT(); + return retVal; } // ---------------------------------------------------------------------------------- diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/orientationssy/src/SsyProperty.cpp --- a/sensorservices/orientationssy/src/SsyProperty.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/orientationssy/src/SsyProperty.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -52,7 +52,11 @@ for ( TInt index = 0; index < aNumberOfProperties ; index++ ) { - iChannelProperties.Append( aProperties[ index ] ); + if(iChannelProperties.Append( aProperties[ index ])!= KErrNone ) + { + iChannelProperties.Reset(); + break; + } } SSY_TRACE_OUT(); diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/sensorserver/inc/server/senserverchannel.h --- a/sensorservices/sensorserver/inc/server/senserverchannel.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/sensorserver/inc/server/senserverchannel.h Thu Sep 02 21:48:26 2010 +0300 @@ -281,18 +281,6 @@ CSensrvConditionEvaluator* ConditionEvaluatorL(); /** - * Get clients of this channel. The client identified by aCallerSecureId - * is not added to the affected clients list. - * - * @since S60 5.0 - * @param[in,out] aAffectedClients On return contains client - * processes priorities for this channel. - * @param[in] aCallerSecureId Identifies the listener which is filtered away. - */ - void GetAffectedClients( RArray& aAffectedClients, - TSecureId aCallerSecureId ); - - /** * Gets listener for session. * * @since S60 5.0 diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/sensorserver/rom/SensorServer.iby --- a/sensorservices/sensorserver/rom/SensorServer.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/sensorserver/rom/SensorServer.iby Thu Sep 02 21:48:26 2010 +0300 @@ -20,7 +20,7 @@ #define SENSORSERVER_IBY file=ABI_DIR\BUILD_DIR\sensorserver.exe PROGRAMS_DIR\sensorserver.exe -file=ABI_DIR\BUILD_DIR\SensrvClient.dll SHARED_LIB_DIR\SensrvClient.dll +file=ABI_DIR\BUILD_DIR\sensrvclient.dll SHARED_LIB_DIR\sensrvclient.dll file=ABI_DIR\BUILD_DIR\sensrvutil.dll SHARED_LIB_DIR\sensrvutil.dll #endif // SENSORSERVER_IBY diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/sensorserver/src/server/sensrvchannel.cpp --- a/sensorservices/sensorserver/src/server/sensrvchannel.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/sensorserver/src/server/sensrvchannel.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -82,6 +82,7 @@ { COMPONENT_TRACE( ( _L( "Sensor Server - CSensrvChannel::ConstructL()" ) ) ); + // coverity[SIZECHECK] iChannelQueue = CSensrvTransactionQueue::NewL( ETrue ); iChannelInfo.iChannelGroup = TSensrvResourceChannelInfo::ESensrvChannelGroupNotSolved; @@ -979,34 +980,7 @@ return previousLow; } -// --------------------------------------------------------------------------- -// CSensrvChannel::GetAffectedClients -// -// Client is considered as "affected" if the channel is opened by the client. -// When the channel is open, channel listener also exists. -// Priorities are queried from ChannelListener. -// --------------------------------------------------------------------------- -// -void CSensrvChannel::GetAffectedClients( RArray& aAffectedClients, - TSecureId aCallerSecureId ) - { - COMPONENT_TRACE( ( _L( "Sensor Server - CSensrvChannel::GetAffectedClients()" ) ) ); - TInt count(iListenerList.Count()); - for (TInt i=0; i < count; i++) - { - if (aCallerSecureId == iListenerList[i]->Session().SecureId() ) - { - //Filter away - } - else - { - aAffectedClients.Append( iListenerList[i]->Priority() ); - } - } - - COMPONENT_TRACE( ( _L( "Sensor Server - CSensrvChannel::GetAffectedClients - %d client(s) found - return" ), count ) ); - } // --------------------------------------------------------------------------- // Creates a new condition evaluator or returns an existing one. diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/sensorserver/src/server/sensrvpluginproxy.cpp --- a/sensorservices/sensorserver/src/server/sensrvpluginproxy.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/sensorserver/src/server/sensrvpluginproxy.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -80,7 +80,8 @@ User::LeaveIfError(iMutex.CreateLocal()); iMutex.Wait(); - + + // coverity[SIZECHECK] iLoadWaitQueue = CSensrvTransactionQueue::NewL(ETrue); iTransactionMonitor = CSensrvTransactionMonitor::NewL(*this); diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/sensorserver/src/server/sensrvproxymanager.cpp --- a/sensorservices/sensorserver/src/server/sensrvproxymanager.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/sensorserver/src/server/sensrvproxymanager.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -90,7 +90,10 @@ iServerShutdown = CSensrvShutdown::NewL( *this ); + // coverity[SIZECHECK] iWaitQueueQueryChannels = CSensrvTransactionQueue::NewL(ETrue); + + // coverity[SIZECHECK] iWaitQueueOpenChannel = CSensrvTransactionQueue::NewL(ETrue); // Create ecom changelistener, which will make the initial check for plugins diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h --- a/sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h Thu Sep 02 21:48:26 2010 +0300 @@ -72,8 +72,7 @@ // @see CActive TInt RunError( TInt aError ); public: - void Start( ); - + void Start(TInt aHrz ); private: // Private data for base channel // The timer object diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/inc/tcstatetiltlistendata.h --- a/sensorservices/tiltcompensationssy/inc/tcstatetiltlistendata.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/inc/tcstatetiltlistendata.h Thu Sep 02 21:48:26 2010 +0300 @@ -173,9 +173,6 @@ // Pointer to the timer CTCSendEventTimer* iTimerToSend; - // Flag that states if the property has changed - TBool iHasChanged; - // The requested amount of data TInt iRequestedDataCount; diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/src/tccenrepobserver.cpp --- a/sensorservices/tiltcompensationssy/src/tccenrepobserver.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tccenrepobserver.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -110,8 +110,13 @@ // CTCCenrepObserver::HandleNotifyError // ----------------------------------------------------------------------------- // +#ifdef _DEBUG void CTCCenrepObserver::HandleNotifyError( TUint32 /*aKey*/, TInt aError, CCenRepNotifyHandler* aHandler) +#else +void CTCCenrepObserver::HandleNotifyError( + TUint32 /*aKey*/, TInt /*aError*/, CCenRepNotifyHandler* aHandler) +#endif { ERROR_1( aError, "CTCCenrepObserver::HandleNotifyError - aError: %d ", aError ); diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp --- a/sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -898,8 +898,14 @@ // CTCChannelTilt::DataError // ---------------------------------------------------------------------------------- // +#ifdef _DEBUG void CTCChannelTilt::DataError( CSensrvChannel& /*aChannel*/, TSensrvErrorSeverity aError ) + +#else +void CTCChannelTilt::DataError( CSensrvChannel& /*aChannel*/, + TSensrvErrorSeverity /*aError*/ ) +#endif { FUNC_LOG; @@ -1150,8 +1156,14 @@ // CTCChannelTilt::PropertyChanged // ---------------------------------------------------------------------------------- // +#ifdef _DEBUG void CTCChannelTilt::PropertyError( CSensrvChannel& /*aChannel*/, TSensrvErrorSeverity aError ) +#else +// not used in UREL builds +void CTCChannelTilt::PropertyError( CSensrvChannel& /*aChannel*/, + TSensrvErrorSeverity /*aError*/ ) +#endif { FUNC_LOG; INFO_1( "Property error [%d]", aError ); @@ -1161,7 +1173,12 @@ // CTCChannelTilt::SetPropertySuccessIndicationChanged // ----------------------------------------------------------------------------- // +#ifdef _DEBUG void CTCChannelTilt::SetPropertySuccessIndicationChanged( TSetPropertySuccessIndicator aIndication ) +#else +// not used in UREL builds +void CTCChannelTilt::SetPropertySuccessIndicationChanged( TSetPropertySuccessIndicator /*aIndication*/ ) +#endif { FUNC_LOG; diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp --- a/sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -75,8 +75,9 @@ User::LeaveIfError( ret ); iTimerToHzLevel = aSetTimerToHzLevel; } -void CTCSendEventTimer::Start() +void CTCSendEventTimer::Start(TInt aHrz) { + iTimerToHzLevel = aHrz; TTimeIntervalMicroSeconds32 interval( KOneSecondInMicroSeconds / iTimerToHzLevel ); if( !IsActive() ) diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/src/tcstatetiltidle.cpp --- a/sensorservices/tiltcompensationssy/src/tcstatetiltidle.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tcstatetiltidle.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -75,6 +75,7 @@ case EEventIdHandleOpenChannel: { iTransactionHandler.ProcessTransactionL( ETCTransactionIdOpenChannel ); + break; } default: { diff -r 072a9626b290 -r 09d657f1ee00 sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp --- a/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -280,7 +280,6 @@ { property.iProperty.GetValue( iHzSamplingRate ); INFO_1( "Sampling rate changed to: %d", iHzSamplingRate ); - iHasChanged = ETrue; HandleStateEntryL(); } break; @@ -355,19 +354,8 @@ if( !iTimerToSend ) { iTimerToSend = CTCSendEventTimer::NewL( iHzSamplingRate, *this ); - iTimerToSend->Start(); } - else if( iHasChanged ) - { - delete iTimerToSend; - iTimerToSend = NULL; - iTimerToSend = CTCSendEventTimer::NewL( iHzSamplingRate, *this ); - iHasChanged = EFalse; - } - else - { - iTimerToSend->Start(); - } + iTimerToSend->Start(iHzSamplingRate); } // ---------------------------------------------------------------------------------- @@ -474,7 +462,7 @@ else { if( iTimerToSend ) - iTimerToSend->Start(); + iTimerToSend->Start(iHzSamplingRate); } } @@ -512,7 +500,11 @@ // CTCStateTiltListenData::CenrepValueChanged // ----------------------------------------------------------------------------- // +#ifdef _DEBUG void CTCStateTiltListenData::CenrepValueChanged( TUint32 aKey, CRepository& aRepository ) +#else +void CTCStateTiltListenData::CenrepValueChanged( TUint32 /*aKey*/, CRepository& aRepository ) +#endif { FUNC_LOG; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/inc/ssmlocalepskeys.h --- a/sysstatemgmt/inc/ssmlocalepskeys.h Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* -* Copyright (c) 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: PSKey definition. -* -*/ -#ifndef __SSMLOCALEPSKEYS_H__ -#define __SSMLOCALEPSKEYS_H__ -#include - -/** Publish and Subscribe key used for observing Collation code changes. */ -static const TInt KSSMCollationPSKey = 501; - -/** Publish and Subscribe key used for observing Region code changes. */ -static const TInt KSSMRegionPSKey = 502; - -/** Publish and Subscribe key used for observing UI Language code changes. */ -static const TInt KSSMUILanguagePSKey = 503; - -#endif // __SSMLOCALEPSKEYS_H__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss --- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Thu Sep 02 21:48:26 2010 +0300 @@ -114,10 +114,20 @@ //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 + //prio 0x7EE0 + ,r_cmd_activitymonmediamgr, //FMAO-867HYW + //prio 0x7EDF + r_cmd_mediamgr, //FMAO-867HYW + //prio 0x7EDE + r_cmd_activitywrtserinstaller, //SSEM-877P5J + //prio 0x7EDD + r_cmd_wrtserviceinstaller //SSEM-877P5J +#ifndef SYMBIAN_EXCLUDE_LOCATION + //prio 0x7EDC + ,r_cmd_activitylbsroot, //BSER-87REDT + //prio 0x7EDB + r_cmd_lbsroot //BSER-87REDT +#endif //SYMBIAN_EXCLUDE_LOCATION }; } @@ -313,6 +323,38 @@ } // --------------------------------------------------------------------------- +// r_cmd_activitywrtserinstaller +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitywrtserinstaller + { + priority = 0x7EDE; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitylbsroot +// --------------------------------------------------------------------------- +// +#ifndef SYMBIAN_EXCLUDE_LOCATION +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitylbsroot + { + priority = 0x7EDC; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } +#endif //SYMBIAN_EXCLUDE_LOCATION + +// --------------------------------------------------------------------------- // r_cmd_autosync // --------------------------------------------------------------------------- // @@ -348,6 +390,20 @@ } // --------------------------------------------------------------------------- +// r_cmd_lbsroot +// --------------------------------------------------------------------------- +// +#ifndef SYMBIAN_EXCLUDE_LOCATION +RESOURCE SSM_START_PROCESS_INFO r_cmd_lbsroot + { + priority = 0x7EDB; + name = "lbsroot.exe"; + execution_behaviour = ESsmFireAndForget; + retries = 2; + } +#endif //SYMBIAN_EXCLUDE_LOCATION + +// --------------------------------------------------------------------------- // r_cmd_mediamgr // --------------------------------------------------------------------------- // @@ -463,6 +519,17 @@ timeout = 10000; } +// --------------------------------------------------------------------------- +// r_cmd_wrtserviceinstaller +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_wrtserviceinstaller + { + priority = 0x7EDD; + name = "z:\\sys\\bin\\wrtserviceinstaller.exe"; + execution_behaviour = ESsmFireAndForget; + } + // =========================================================================== // DLL data items in alphabetical order // =========================================================================== diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmcmdlists/data/securitycheckcmdlist.rss --- a/sysstatemgmt/ssmcmdlists/data/securitycheckcmdlist.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmcmdlists/data/securitycheckcmdlist.rss Thu Sep 02 21:48:26 2010 +0300 @@ -121,7 +121,7 @@ RESOURCE SSM_START_APP_INFO r_cmd_idle { priority = 0xFFE7; - name = "z:\\sys\\bin\\hsapplication.exe"; + name = "z:\\sys\\bin\\hsapplicationlauncher.exe"; execution_behaviour = ESsmDeferredWaitForSignal; monitor_info = r_mon_max_restarts_ignore; } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmcmdlists/data/uiservicescmdlist.rss --- a/sysstatemgmt/ssmcmdlists/data/uiservicescmdlist.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmcmdlists/data/uiservicescmdlist.rss Thu Sep 02 21:48:26 2010 +0300 @@ -87,10 +87,7 @@ // prio 0xFF86 - accsrv, seleclanguage (dbrecovery has been moved to extended startup list but uses the same multiplewait command)) r_cmd_multiwaitforever2, // prio 0xFF85 - r_cmd_loadlocalesup, // Observes changes in locale data - r_cmd_loadcollation, // Observes changes in Collation setting - r_cmd_loadregion, // Observes changes in Region setting - r_cmd_loaduilanguage, // Observes changes in UI Language setting + r_cmd_loadlocalesup, // Observes changes in locale data // prio 0xFF79 r_cmd_aknstart, // UI Framework r_cmd_hbthemeserver, //CR:KJLN-7WBEGU @@ -207,38 +204,7 @@ ordinal = 1; } -// --------------------------------------------------------------------------- -// r_cmd_loadcollation -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loadcollation - { - priority = 0xFF85; - filename = "ssmlocaleobserversup.dll"; - ordinal = 2; - } -// --------------------------------------------------------------------------- -// r_cmd_loadregion -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loadregion - { - priority = 0xFF85; - filename = "ssmlocaleobserversup.dll"; - ordinal = 3; - } - -// --------------------------------------------------------------------------- -// r_cmd_loaduilanguage -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loaduilanguage - { - priority = 0xFF85; - filename = "ssmlocaleobserversup.dll"; - ordinal = 4; - } // --------------------------------------------------------------------------- // r_cmd_loadpowersup diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmcustcmds/ssmsystemcmds/src/ssminitpskeys.cpp --- a/sysstatemgmt/ssmcustcmds/ssmsystemcmds/src/ssminitpskeys.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmcustcmds/ssmsystemcmds/src/ssminitpskeys.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -20,7 +20,6 @@ #include "ssmmapperutility.h" #include "ssmmapperutilityinternalpskeys.h" #include "ssmcustcmdsprivatepskeys.h" -#include "ssmlocalepskeys.h" #include "trace.h" #include @@ -274,30 +273,7 @@ KReadDeviceDataPolicy, KWriteDeviceDataPolicy ); SetL( KPSStarterUid, KRTCPropertyKey, 0 ); - - //Used for observing the Collation code change in CSsmCollationObserver - INFO( "KPSStarterUid::KSSMCollationPSKey" ); - DefineL( KPSStarterUid, - KSSMCollationPSKey, - KReadDeviceDataPolicy, - KWriteDeviceDataPolicy ); - SetL( KPSStarterUid, KSSMCollationPSKey, 0 ); - - //Used for observing the Region code change in CSsmRegionObserver - INFO( "KPSStarterUid::KSSMRegionPSKey" ); - DefineL( KPSStarterUid, - KSSMRegionPSKey, - KReadDeviceDataPolicy, - KWriteDeviceDataPolicy ); - SetL( KPSStarterUid, KSSMRegionPSKey, 0 ); - - - INFO( "KPSStarterUid::KSSMUiLanguagePSKey " ); - DefineL( KPSStarterUid, - KSSMUILanguagePSKey , - KReadDeviceDataPolicy, - KWriteDeviceDataPolicy ); - SetL( KPSStarterUid, KSSMUILanguagePSKey , 0 ); + INFO( "KPSUidStartup::KIgnoreSecurityEvent" ); DefineL( KPSUidStartup, diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmpolicyplugins/conf/ssmpolicyplugins.confml Binary file sysstatemgmt/ssmpolicyplugins/conf/ssmpolicyplugins.confml has changed diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmpolicyplugins/conf/ssmpolicyplugins_101F8762.crml Binary file sysstatemgmt/ssmpolicyplugins/conf/ssmpolicyplugins_101F8762.crml has changed diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmpolicyplugins/ssmshutdownpolicy/src/ssmshutdownpolicy.cpp --- a/sysstatemgmt/ssmpolicyplugins/ssmshutdownpolicy/src/ssmshutdownpolicy.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmpolicyplugins/ssmshutdownpolicy/src/ssmshutdownpolicy.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -217,6 +217,16 @@ TInt errorCode = repository->Set( KStartupReason, aReasonCode ); ERROR( errorCode, "Failed to set KStartupReason CenRep key" ); + // In case of disk full, we will not try to set the device lock query status cenrep key here. + // Rather it is set after disk space is recovered. + if ((EUnknownReset != aReasonCode) && (KErrDiskFull != errorCode)) + { + // Set the lock code query success as EStartupDevLockNotSucess in case the shutdown is not due to the the unknown reset. + // This is because if the device crashes before resetting the key during boot time. + errorCode = repository->Set(KStartupDevLockStatus, EStartupDevLockNotSucess); + INFO_1("Setting KStartupDevLockStatus CenRep key with EStartupDevLockNotSucess completed with %d", errorCode); + } + if( KErrDiskFull == errorCode ) { //Need not to put on CleanupStack, it's not calling any leaving function and @@ -228,6 +238,14 @@ { errorCode = repository->Set( KStartupReason, aReasonCode ); ERROR( errorCode, "Failed to set KStartupReason CenRep key after freeing the memory" ); + + if (EUnknownReset != aReasonCode) + { + // Set the lock code query success as EStartupDevLockNotSucess in case the shutdown is not due to the the unknown reset. + // This is because if the device crashes before resetting the key during boot time. + errorCode = repository->Set(KStartupDevLockStatus, EStartupDevLockNotSucess); + ERROR( errorCode, "Failed to set KStartupDevLockStatus CenRep key after freeing the memory" ); + } } CSsmUiSpecific::Release(); } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/bwins/ssmlocaleobserversupu.def --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/bwins/ssmlocaleobserversupu.def Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/bwins/ssmlocaleobserversupu.def Thu Sep 02 21:48:26 2010 +0300 @@ -1,6 +1,3 @@ EXPORTS ?NewL@CSsmLocaleObserverSup@@SAPAVMSsmUtility@@XZ @ 1 NONAME ; class MSsmUtility * CSsmLocaleObserverSup::NewL(void) - ?NewL@CSsmCollationObserver@@SAPAVMSsmUtility@@XZ @ 2 NONAME ; class MSsmUtility * CSsmCollationObserver::NewL(void) - ?NewL@CSsmRegionObserver@@SAPAVMSsmUtility@@XZ @ 3 NONAME ; class MSsmUtility * CSsmRegionObserver::NewL(void) - ?NewL@CSsmUiLanguageObserver@@SAPAVMSsmUtility@@XZ @ 4 NONAME ; class MSsmUtility * CSsmUiLanguageObserver::NewL(void) diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/eabi/ssmlocaleobserversupu.def --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/eabi/ssmlocaleobserversupu.def Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/eabi/ssmlocaleobserversupu.def Thu Sep 02 21:48:26 2010 +0300 @@ -1,6 +1,3 @@ EXPORTS _ZN21CSsmLocaleObserverSup4NewLEv @ 1 NONAME - _ZN18CSsmRegionObserver4NewLEv @ 2 NONAME - _ZN21CSsmCollationObserver4NewLEv @ 3 NONAME - _ZN22CSsmUiLanguageObserver4NewLEv @ 4 NONAME diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/group/ssmlocaleobserversup.mmp --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/group/ssmlocaleobserversup.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/group/ssmlocaleobserversup.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -28,9 +28,6 @@ SOURCEPATH ../src SOURCE ssmlocaleobserversup.cpp -SOURCE ssmcollationobserversup.cpp -SOURCE ssmregionobserversup.cpp -SOURCE ssmuilanguageobserversup.cpp USERINCLUDE ../inc USERINCLUDE ../../inc @@ -44,8 +41,6 @@ LIBRARY euser.lib LIBRARY ssmcmn.lib LIBRARY ssmmapperutility.lib -LIBRARY centralrepository.lib - // >>> uncomment to enable function-level tracing // MACRO __SSM_FUNC_TRACE__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmcollationobserversup.h --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmcollationobserversup.h Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -/* -* Copyright (c) 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: Declaration of CSsmCollationObserver class. -* -*/ - -#ifndef __SSMCOLLATIONOBSERVER_H__ -#define __SSMCOLLATIONOBSERVER_H__ - -#include -#include -#include - -/** -* SSM Utility plugin to observe the Collation code changes and load the new collation -* when it is changed. -*/ -NONSHARABLE_CLASS( CSsmCollationObserver ) : public CActive, public MSsmUtility - { -public: - //From MSsmUtility - void InitializeL(); - void StartL(); - void Release(); - -public: - /** - * Two-phased constructor. - */ - IMPORT_C static MSsmUtility* NewL(); - -protected: - // from base class CActive - - /** - * Implements cancellation of an outstanding request. - */ - void DoCancel(); - - /** - * Handles an active object’s request completion event. - * This RunL will never leave, so RunError not needed. - */ - void RunL(); - -private: - /** - * Destructor. - */ - ~CSsmCollationObserver(); - - /** - * C++ default constructor. - */ - CSsmCollationObserver(); - - /** - * Activate the active object. - */ - void Activate(); - - /** - * Loads the Collation set in the PS key. - */ - void LoadCollation(); - - /** - * Store the Collation code to Central Repository. - * @param aCollation The Collation code to store. - */ - void StoreCollationToCentRep( const TInt aCollation ); - -private: // data - - /** - * Used for observing Collation code changes. - */ - RProperty iCollationProperty; - }; -#endif // __SSMCOLLATIONOBSERVER_H__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmregionobserversup.h --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmregionobserversup.h Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -/* -* Copyright (c) 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: Declaration of CSsmRegionObserver class. -* -*/ -#ifndef __SSMREGIONOBSERVER_H__ -#define __SSMREGIONOBSERVER_H__ - -#include -#include -#include -#include "trace.h" - -/** -* SSM Utility plugin to observe the Region code changes and load the new Region -* when it is changed. -*/ -NONSHARABLE_CLASS( CSsmRegionObserver ) : public CActive, public MSsmUtility - { -public: - //From MSsmUtility - void InitializeL(); - void StartL(); - void Release(); - -public: - /** - * Two-phased constructor. - */ - IMPORT_C static MSsmUtility* NewL(); - -protected: - // from base class CActive - - /** - * Implements cancellation of an outstanding request. - */ - void DoCancel(); - - /** - * Handles an active object’s request completion event. - * This RunL will never leave, so RunError not needed. - */ - void RunL(); - -private: - /** - * Destructor. - */ - ~CSsmRegionObserver(); - - /** - * C++ default constructor. - */ - CSsmRegionObserver(); - - /** - * Activate the active object. - */ - void Activate(); - - /** - * Loads the Region set in the PS key. - */ - void LoadRegion(); - - /** - * Store the Region code to Central Repository. - * @param aRegion The Region code to store. - */ - void StoreRegionToCentRep( const TInt aRegion); - -private: // data - - /** - * Used for observing Region code changes. - */ - RProperty iRegionProperty; - }; -#endif // __SSMREGIONOBSERVER_H__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmuilanguageobserversup.h --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmuilanguageobserversup.h Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -/* -* Copyright (c) 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: Declaration of CSsmUiLanguageObserver class. -* -*/ -#ifndef __SSMUILANGUAGEOBSERVER_H__ -#define __SSMUILANGUAGEOBSERVER_H__ - -#include -#include -#include -#include "trace.h" - -/** -* SSM Utility plugin to observe the UI Language code changes and load the new UI Language -* when it is changed. -*/ -NONSHARABLE_CLASS( CSsmUiLanguageObserver ) : public CActive, public MSsmUtility - { -public: - //From MSsmUtility - void InitializeL(); - void StartL(); - void Release(); - -public: - /** - * Two-phased constructor. - */ - IMPORT_C static MSsmUtility* NewL(); - -protected: - // from base class CActive - - /** - * Implements cancellation of an outstanding request. - */ - void DoCancel(); - - /** - * Handles an active object’s request completion event. - * This RunL will never leave, so RunError not needed. - */ - void RunL(); - -private: - /** - * Destructor. - */ - ~CSsmUiLanguageObserver(); - - /** - * C++ default constructor. - */ - CSsmUiLanguageObserver(); - - /** - * Activate the active object. - */ - void Activate(); - - /** - * Loads the Language set in the PS key. - */ - void LoadUILanguage(); - - /** - * Store the Language code to Central Repository. - * @param aUILanguage The Language code to store. - */ - void StoreUILanguageToCentRep( const TInt aUILanguage); - -private: // data - - /** - * Used for observing UI Language code changes. - */ - RProperty iUILanguageProperty; - }; -#endif // __SSMUILANGUAGEOBSERVER_H__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmcollationobserversup.cpp --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmcollationobserversup.cpp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,195 +0,0 @@ -/* -* Copyright (c) 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: Implementation of CSsmCollationObserver class. -* -*/ -#include "ssmcollationobserversup.h" -#include "ssmlocalepskeys.h" -#include "ssmmapperutilityinternalpskeys.h" -#include "ssmcommonlocale.h" -#include "trace.h" -#include -#include - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::NewL() -// --------------------------------------------------------------------------- -// -EXPORT_C MSsmUtility* CSsmCollationObserver::NewL() - { - FUNC_LOG; - CSsmCollationObserver* self = new( ELeave ) CSsmCollationObserver(); - return self; - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::InitializeL() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::InitializeL() - { - - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::StartL() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::StartL() - { - FUNC_LOG; - TInt errorCode = iCollationProperty.Attach( KPSStarterUid, KSSMCollationPSKey ); - ERROR_2( errorCode, "Failed to attach to property 0x%08x::0x%08x", KPSStarterUid.iUid, KSSMCollationPSKey ); - Activate(); - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::Release() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::Release() - { - FUNC_LOG; - delete this; - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::~CSsmCollationObserver() -// --------------------------------------------------------------------------- -// -CSsmCollationObserver::~CSsmCollationObserver() - { - FUNC_LOG; - Cancel(); - iCollationProperty.Close(); - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::DoCancel() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::DoCancel() - { - FUNC_LOG; - iCollationProperty.Cancel(); - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::RunL() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::RunL() - { - FUNC_LOG; - const TInt errorCode = iStatus.Int(); - if (KErrNone == errorCode ) - { - Activate(); - LoadCollation(); - } - else - { - INFO_1( "CSsmCollationObserver::RunL()completed with: %d - not reactivating", iStatus.Int() ); - } - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::LoadCollation() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::LoadCollation() - { - FUNC_LOG; - TInt collation(0); - TInt errorCode = iCollationProperty.Get( collation ); - - if( KErrNone != errorCode ) - { - INFO_1( "Failed to get KSSMCollationPSKey value with error %d", errorCode ); - return; - } - - // Dot plus three digit locale - TBuf extension; - extension.Format( KDllExtensionFormat, collation ); - - // Padd ".1" to ".001" for compatibility. - for( ; extension.Length() < KMinDllExtensionLength ;) - { - extension.Insert( KDllExtensionPaddingPosition, - KDllExtensionPadding ); - } - - TBuf collationDllName( KCollationDllNameBase ); - collationDllName.Append( extension ); - INFO_1( "Loading Collation DLL named '%S'", &collationDllName ); - - TExtendedLocale extLocale; - extLocale.LoadSystemSettings(); - errorCode = extLocale.LoadLocaleAspect( collationDllName ); - - if ( KErrNone == errorCode ) - { - errorCode = extLocale.SaveSystemSettings(); - ERROR( errorCode, "Failed to save locale (Collation) settings" ); - TLocale().Set(); - StoreCollationToCentRep( collation ); - } - else - { - INFO_1( "Failed to load locale (Collation) with error %d", errorCode ); - } - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::StoreCollationToCentRep -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::StoreCollationToCentRep( const TInt aCollation ) - { - FUNC_LOG; - CRepository* cenrep = NULL; - TRAPD( errorCode, cenrep = CRepository::NewL( KCRUidCommonEngineKeys ) ); - ERROR_1( errorCode, "Failed to initialize cen rep %d", errorCode ); - - if ( KErrNone == errorCode ) - { - errorCode = cenrep->Set( KGSCollation, aCollation); - ERROR_1( errorCode, "Failed to store collation code to CentRep, %d", - errorCode ); - delete cenrep; - } - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::CSsmCollationObserver() -// --------------------------------------------------------------------------- -// -CSsmCollationObserver::CSsmCollationObserver() : CActive( EPriorityStandard ) - { - FUNC_LOG; - CActiveScheduler::Add( this ); - } - -// --------------------------------------------------------------------------- -// CSsmCollationObserver::Activate() -// --------------------------------------------------------------------------- -// -void CSsmCollationObserver::Activate() - { - FUNC_LOG; - ASSERT( !IsActive() ); - iCollationProperty.Subscribe( iStatus ); - SetActive(); - } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmregionobserversup.cpp --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmregionobserversup.cpp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ -/* -* Copyright (c) 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: Implementation of CSsmRegionObserver class. -* -*/ -#include "ssmregionobserversup.h" -#include "ssmlocalepskeys.h" -#include "ssmmapperutilityinternalpskeys.h" -#include "ssmcommonlocale.h" -#include "trace.h" -#include -#include - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::NewL -// --------------------------------------------------------------------------- -// -EXPORT_C MSsmUtility* CSsmRegionObserver::NewL() - { - FUNC_LOG; - CSsmRegionObserver* self = new( ELeave ) CSsmRegionObserver(); - return self; - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::InitializeL -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::InitializeL() - { - - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::StartL -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::StartL() - { - FUNC_LOG; - TInt errorCode = iRegionProperty.Attach( KPSStarterUid, KSSMRegionPSKey ); - ERROR_2( errorCode, "Failed to attach to property 0x%08x::0x%08x", KPSStarterUid.iUid, KSSMRegionPSKey ); - Activate(); - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::Release -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::Release() - { - FUNC_LOG; - delete this; - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::~CSsmRegionObserver -// --------------------------------------------------------------------------- -// -CSsmRegionObserver::~CSsmRegionObserver() - { - FUNC_LOG; - Cancel(); - iRegionProperty.Close(); - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::DoCancel -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::DoCancel() - { - FUNC_LOG; - iRegionProperty.Cancel(); - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::RunL -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::RunL() - { - FUNC_LOG; - const TInt errorCode = iStatus.Int(); - if ( KErrNone == errorCode ) - { - Activate(); - LoadRegion(); - } - else - { - INFO_1("CSsmRegionObserver::RunL()completed with: %d - not reactivating", iStatus.Int()); - } - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::LoadRegion -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::LoadRegion() - { - TInt region(0); - TInt errorCode = iRegionProperty.Get( region); - if( KErrNone != errorCode ) - { - INFO_1( "Failed to get KSSMRegionPSKey value with error %d", errorCode ); - return; - } - - // Dot plus five digit locale - TBuf extension; - extension.Format( KDllExtensionFormat, region); - - // Padd ".1" to ".01" for compatibility. - for( ; extension.Length() < KMinDllExtensionLength ;) - { - extension.Insert( KDllExtensionPaddingPosition, - KDllExtensionPadding ); - } - - TBuf regionDllName( KRegionDllNameBase ); - regionDllName.Append( extension ); - INFO_1( "Loading region DLL named '%S'", ®ionDllName ); - - TExtendedLocale extLocale; - extLocale.LoadSystemSettings(); - errorCode = extLocale.LoadLocaleAspect(regionDllName ); - - ERROR( errorCode, "Failed to load region" ); - - if ( KErrNone == errorCode ) - { - errorCode = extLocale.SaveSystemSettings(); - ERROR( errorCode, "Failed to set region" ); - TLocale().Set(); - StoreRegionToCentRep( region ); - } - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::StoreRegionToCentRep -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::StoreRegionToCentRep( const TInt aRegion ) - { - FUNC_LOG; - CRepository* cenrep = NULL; - TRAPD( errorCode, cenrep = CRepository::NewL( KCRUidCommonEngineKeys ) ); - ERROR_1( errorCode, "Failed to initialize cen rep %d", errorCode ); - - if ( KErrNone == errorCode ) - { - errorCode = cenrep->Set( KGSRegion, aRegion); - ERROR_1( errorCode, "Failed to store region code to CentRep, %d", - errorCode ); - delete cenrep; - } - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::CSsmRegionObserver -// --------------------------------------------------------------------------- -// -CSsmRegionObserver::CSsmRegionObserver() : CActive( EPriorityStandard ) - { - CActiveScheduler::Add( this ); - } - -// --------------------------------------------------------------------------- -// CSsmRegionObserver::Activate -// --------------------------------------------------------------------------- -// -void CSsmRegionObserver::Activate() - { - FUNC_LOG; - ASSERT( !IsActive() ); - iRegionProperty.Subscribe( iStatus ); - SetActive(); - } - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmuilanguageobserversup.cpp --- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmuilanguageobserversup.cpp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,192 +0,0 @@ -/* -* Copyright (c) 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: Implementation of CSsmUiLanguageObserver class. -* -*/ -#include "ssmuilanguageobserversup.h" -#include "ssmlocalepskeys.h" -#include "ssmmapperutilityinternalpskeys.h" -#include "ssmcommonlocale.h" -#include "trace.h" -#include -#include - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::NewL -// --------------------------------------------------------------------------- -// -EXPORT_C MSsmUtility* CSsmUiLanguageObserver::NewL() - { - FUNC_LOG; - CSsmUiLanguageObserver* self = new( ELeave ) CSsmUiLanguageObserver(); - return self; - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::InitializeL -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::InitializeL() - { - - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::StartL -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::StartL() - { - FUNC_LOG; - TInt errorCode = iUILanguageProperty.Attach( KPSStarterUid, KSSMUILanguagePSKey ); - ERROR_2( errorCode, "Failed to attach to property 0x%08x::0x%08x", KPSStarterUid.iUid, KSSMUILanguagePSKey ); - Activate(); - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::Release -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::Release() - { - FUNC_LOG; - delete this; - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::~CSsmUiLanguageObserver -// --------------------------------------------------------------------------- -// -CSsmUiLanguageObserver::~CSsmUiLanguageObserver() - { - FUNC_LOG; - Cancel(); - iUILanguageProperty.Close(); - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::DoCancel -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::DoCancel() - { - FUNC_LOG; - iUILanguageProperty.Cancel(); - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::RunL -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::RunL() - { - FUNC_LOG; - const TInt errorCode = iStatus.Int(); - if (KErrNone == errorCode ) - { - Activate(); - LoadUILanguage(); - } - else - { - INFO_1("CSsmUiLanguageObserver::RunL()completed with: %d - not reactivating", iStatus.Int()); - } - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::LoadUILanguage -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::LoadUILanguage() - { - FUNC_LOG; - TInt uiLanguage(0); - TInt errorCode = iUILanguageProperty.Get( uiLanguage ); - - if( KErrNone != errorCode ) - { - INFO_1( "Failed to get KSSMUILanguagePSKey value with error %d", errorCode ); - return; - } - - // Dot plus five digit locale - TBuf extension; - extension.Format( KDllExtensionFormat, uiLanguage ); - - // Padd ".1" to ".001" for compatibility. - for( ; extension.Length() < KMinDllExtensionLength ;) - { - extension.Insert( KDllExtensionPaddingPosition, - KDllExtensionPadding ); - } - - TBuf uiLanguageDllName( KLanguageDllNameBase ); - uiLanguageDllName.Append( extension ); - INFO_1( "Loading UI Language DLL named '%S'", &uiLanguageDllName ); - - TExtendedLocale extLocale; - extLocale.LoadSystemSettings(); - errorCode = extLocale.LoadLocaleAspect( uiLanguageDllName ); - ERROR( errorCode, "Failed to load locale" ); - - if ( errorCode == KErrNone ) - { - errorCode = extLocale.SaveSystemSettings(); - ERROR( errorCode, "Failed to set locale" ); - TLocale().Set(); - StoreUILanguageToCentRep( uiLanguage ); - } - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::StoreUILanguageToCentRep -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::StoreUILanguageToCentRep( const TInt aUILanguage ) - { - FUNC_LOG; - CRepository* cenrep = NULL; - TRAPD( errorCode, cenrep = CRepository::NewL( KCRUidCommonEngineKeys ) ); - ERROR_1( errorCode, "Failed to initialize cen rep %d", errorCode ); - - if ( KErrNone == errorCode ) - { - errorCode = cenrep->Set( KGSDisplayTxtLang, aUILanguage); - ERROR_1( errorCode, "Failed to store UI Language code to CentRep, %d", - errorCode ); - delete cenrep; - } - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::CSsmUiLanguageObserver -// --------------------------------------------------------------------------- -// -CSsmUiLanguageObserver::CSsmUiLanguageObserver() : CActive( EPriorityStandard ) - { - FUNC_LOG; - CActiveScheduler::Add( this ); - } - -// --------------------------------------------------------------------------- -// CSsmUiLanguageObserver::Activate -// --------------------------------------------------------------------------- -// -void CSsmUiLanguageObserver::Activate() - { - FUNC_LOG; - ASSERT( !IsActive() ); - iUILanguageProperty.Subscribe( iStatus ); - SetActive(); - } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/syslangutil/bwins/syslangutilu.def --- a/sysstatemgmt/syslangutil/bwins/syslangutilu.def Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/syslangutil/bwins/syslangutilu.def Thu Sep 02 21:48:26 2010 +0300 @@ -3,4 +3,10 @@ ?GetInstalledLanguages@SysLangUtil@@SAHAAPAV?$CArrayFixFlat@H@@PAVRFs@@@Z @ 2 NONAME ; int SysLangUtil::GetInstalledLanguages(class CArrayFixFlat * &, class RFs *) ?IsValidLanguage@SysLangUtil@@SAHABHPAVRFs@@@Z @ 3 NONAME ; int SysLangUtil::IsValidLanguage(int const &, class RFs *) ?RestoreSIMLanguage@SysLangUtil@@SAHAAHPAVRFs@@@Z @ 4 NONAME ; int SysLangUtil::RestoreSIMLanguage(int &, class RFs *) + ?ChangeRegion@SysLangUtil@@SAHH@Z @ 5 NONAME ; int SysLangUtil::ChangeRegion(int) + ?ChangeLanguage@SysLangUtil@@SAHH@Z @ 6 NONAME ; int SysLangUtil::ChangeLanguage(int) + ?ChangeCollation@SysLangUtil@@SAHH@Z @ 7 NONAME ; int SysLangUtil::ChangeCollation(int) + ?GetInstalledRegions@SysLangUtil@@SAHAAPAV?$CArrayFixFlat@H@@PAVRFs@@@Z @ 8 NONAME ; int SysLangUtil::GetInstalledRegions(class CArrayFixFlat * &, class RFs *) + ?GetInstalledCollations@SysLangUtil@@SAHAAPAV?$CArrayFixFlat@H@@PAVRFs@@@Z @ 9 NONAME ; int SysLangUtil::GetInstalledCollations(class CArrayFixFlat * &, class RFs *) + diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/syslangutil/eabi/syslangutilu.def --- a/sysstatemgmt/syslangutil/eabi/syslangutilu.def Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/syslangutil/eabi/syslangutilu.def Thu Sep 02 21:48:26 2010 +0300 @@ -3,4 +3,9 @@ _ZN11SysLangUtil18GetDefaultLanguageERiP3RFs @ 2 NONAME _ZN11SysLangUtil18RestoreSIMLanguageERiP3RFs @ 3 NONAME _ZN11SysLangUtil21GetInstalledLanguagesERP13CArrayFixFlatIiEP3RFs @ 4 NONAME + _ZN11SysLangUtil12ChangeRegionEi @ 5 NONAME + _ZN11SysLangUtil14ChangeLanguageEi @ 6 NONAME + _ZN11SysLangUtil15ChangeCollationEi @ 7 NONAME + _ZN11SysLangUtil19GetInstalledRegionsERP13CArrayFixFlatIiEP3RFs @ 8 NONAME + _ZN11SysLangUtil22GetInstalledCollationsERP13CArrayFixFlatIiEP3RFs @ 9 NONAME diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/syslangutil/inc/syslangutiltrace.h --- a/sysstatemgmt/syslangutil/inc/syslangutiltrace.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/syslangutil/inc/syslangutiltrace.h Thu Sep 02 21:48:26 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" @@ -28,10 +28,12 @@ #define ASSERT_ALWAYS_TRACE AssertTraceFunc( _L8( __FILE__ ), __LINE__ ) #define ASSERT_TRACE( a ) if( !( a ) ) { ASSERT_ALWAYS_TRACE; } #define ERROR_TRACE_1( a, b ) TraceFunc( _L( a ), b ) + #define ERROR_TRACE_2( a, b, c ) TraceFunc( _L( a ), b,c ) #else #define ASSERT_ALWAYS_TRACE #define ASSERT_TRACE( a ) #define ERROR_TRACE_1( a, b ) + #define ERROR_TRACE_2( a, b, c ) #endif #if defined _DEBUG && defined __SYSLANG_TRACE__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/syslangutil/rom/syslangutil.iby --- a/sysstatemgmt/syslangutil/rom/syslangutil.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/syslangutil/rom/syslangutil.iby Thu Sep 02 21:48:26 2010 +0300 @@ -32,9 +32,9 @@ file=ABI_DIR\BUILD_DIR\elocl_reg.826 SHARED_LIB_DIR\elocl_reg.826 file=ABI_DIR\BUILD_DIR\elocl_col.001 SHARED_LIB_DIR\elocl_col.001 #else -file=\epoc32\release\armi\DEBUG_DIR\elocl_lan.001 System\libs\elocl_lan.001 -file=\epoc32\release\armi\DEBUG_DIR\elocl_reg.826 System\libs\elocl_reg.826 -file=\epoc32\release\armi\DEBUG_DIR\elocl_col.001 System\libs\elocl_col.001 +file=EPOCROOT##epoc32\release\armi\DEBUG_DIR\elocl_lan.001 System\libs\elocl_lan.001 +file=EPOCROOT##epoc32\release\armi\DEBUG_DIR\elocl_reg.826 System\libs\elocl_reg.826 +file=EPOCROOT##epoc32\release\armi\DEBUG_DIR\elocl_col.001 System\libs\elocl_col.001 #endif //EKA2 // diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/syslangutil/src/syslangutil.cpp --- a/sysstatemgmt/syslangutil/src/syslangutil.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/syslangutil/src/syslangutil.cpp Thu Sep 02 21:48:26 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" @@ -23,16 +23,25 @@ #include "syslangutiltrace.h" #include "ssmmapperutilitystatic.h" #include "syslangutilprivatecrkeys.h" +#include "ssmcommonlocale.h" +#include const TInt KReadBufSize = 10; -const TInt KLangArraySize = 20; +const TInt KLangArraySize = 10; +//Maximum number of retries for starting cenrep transaction. +const TInt KMaxCountForReiteration = 5; // R&D support: Use language file in Starters internal directory for module // testing purposes. #ifdef __STARTER_MODULE_TEST_SUPPORT__ _LIT( KLanguagesIni, "C:\\private\\100059C9\\languages.txt" ); + _LIT( KRegionsIni, "C:\\private\\100059C9\\regions.txt" ); + _LIT( KCollationsIni, "C:\\private\\100059C9\\collations.txt" ); + #else // __STARTER_MODULE_TEST_SUPPORT__ _LIT( KLanguagesIni, "z:\\resource\\bootdata\\languages.txt" ); + _LIT( KRegionsIni, "z:\\resource\\bootdata\\regions.txt" ); + _LIT( KCollationsIni, "z:\\resource\\bootdata\\collations.txt" ); #endif // __STARTER_MODULE_TEST_SUPPORT__ // ============================ MEMBER FUNCTIONS =============================== @@ -351,3 +360,172 @@ FUNC_EXIT_TRACE; return aRFs; } + +// ----------------------------------------------------------------------------- +// SysLangUtil::ChangeLanguage +// +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt SysLangUtil::ChangeLanguage(const TInt aLanguageCode) + { + API_FUNC_ENTRY_TRACE; + TRAPD( errorCode, LoadDllL( KGSDisplayTxtLang,aLanguageCode, KLanguageDllNameBase ) ); + FUNC_EXIT_RET_TRACE( errorCode ); + return errorCode; + } + + +// ----------------------------------------------------------------------------- +// SysLangUtil::ChangeRegion +// +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt SysLangUtil::ChangeRegion(const TInt aRegionCode) + { + API_FUNC_ENTRY_TRACE; + TRAPD( errorCode, LoadDllL( KGSRegion, aRegionCode, KRegionDllNameBase ) ); + FUNC_EXIT_RET_TRACE( errorCode ); + return errorCode; + } + +// ----------------------------------------------------------------------------- +// SysLangUtil::ChangeCollation +// +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt SysLangUtil::ChangeCollation(const TInt aCollationCode) + { + API_FUNC_ENTRY_TRACE; + TRAPD( errorCode, LoadDllL( KGSCollation, aCollationCode, KCollationDllNameBase ) ); + FUNC_EXIT_RET_TRACE( errorCode ); + return errorCode; + } + + +// ----------------------------------------------------------------------------- +// SysLangUtil::GetInstalledRegions +// +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt SysLangUtil::GetInstalledRegions(CArrayFixFlat*& aRegions, RFs* aFileServerSession ) + { + API_FUNC_ENTRY_TRACE; + TRAPD(err, ReadFileL(aRegions, KRegionsIni, aFileServerSession )); + FUNC_EXIT_RET_TRACE( err ); + return err; + } + +// ----------------------------------------------------------------------------- +// SysLangUtil::GetInstalledCollations +// +// ----------------------------------------------------------------------------- +// +EXPORT_C TInt SysLangUtil::GetInstalledCollations(CArrayFixFlat*& aCollations, RFs* aFileServerSession ) + { + API_FUNC_ENTRY_TRACE; + TRAPD(err, ReadFileL(aCollations, KCollationsIni, aFileServerSession )); + FUNC_EXIT_RET_TRACE( err ); + return err; + } + +void SysLangUtil::LoadDllL( const TUint32 aCategory,const TInt aCode, const TDesC& aDllNameBase ) + { + CRepository* cenrep = NULL; + TUint32 keyInfo; + cenrep = CRepository::NewLC( KCRUidCommonEngineKeys ); + + // Re-iterate through StartTransaction, if errorCode returned is KErrLocked + TInt errorCode = KErrLocked; + //Counter to restrict re-iteration. + TInt counter = KMaxCountForReiteration; + while ( KErrLocked == errorCode && counter > 0 ) + { + errorCode = cenrep->StartTransaction(CRepository::EConcurrentReadWriteTransaction); + --counter; + } + User::LeaveIfError(errorCode); + cenrep->CleanupCancelTransactionPushL(); + User::LeaveIfError(cenrep->Set( aCategory, aCode)); + + TBuf extension; + extension.Format( KDllExtensionFormat, aCode ); + + // Padd ".1" to ".001" for compatibility. + for( ; extension.Length() < KMinDllExtensionLength ;) + { + extension.Insert( KDllExtensionPaddingPosition, + KDllExtensionPadding ); + } + + TBuf dllName( aDllNameBase ); + dllName.Append( extension ); + + //Loading DLL + TExtendedLocale extLocale; + extLocale.LoadSystemSettings(); + errorCode = extLocale.LoadLocaleAspect( dllName ); + ERROR_TRACE_2( "LoadLocaleAspect returned error %d while loading dll %S" ,errorCode, &dllName ); + User::LeaveIfError(errorCode); + + User::LeaveIfError(extLocale.SaveSystemSettings()); + errorCode = cenrep->CommitTransaction(keyInfo); + if ( KErrNone != errorCode ) + { + ERROR_TRACE_2( "CommitTransaction() error: Key Info %d for setting Category %d", keyInfo, aCategory ); + User::Leave(errorCode); + } + CleanupStack::PopAndDestroy();// for CleanupCancelTransactionPushL() + CleanupStack::PopAndDestroy(cenrep); + User::LeaveIfError(TLocale().Set()); + } + +void SysLangUtil::ReadFileL(CArrayFixFlat*& aArray, const TDesC& aFilePath, RFs* aFileServerSession ) + { + TBool hadFS = EFalse; + TInt err = KErrNone; + if ( aArray ) + { + delete aArray; + aArray = NULL; + } + aArray = new(ELeave) CArrayFixFlat( KLangArraySize ); + + aFileServerSession = CheckFS( aFileServerSession, hadFS, err ); + User::LeaveIfError(err); + RFile file; + CleanupClosePushL(file); + err = file.Open(*aFileServerSession, aFilePath, EFileStream | EFileRead | EFileShareReadersOnly ); + ERROR_TRACE_2( "SysLangUtil::ReadFileL() : Opening the file : %S failed with error : %d", &aFilePath, err) ; + User::LeaveIfError(err); + + // Prepare Reader + TFileText reader; + reader.Set( file ); + err = reader.Seek( ESeekStart ); + if ( !err ) + { + TBuf readBuf; + for ( TInt i = 0; !reader.Read( readBuf ) && readBuf.Length(); ++i ) + { + TLex lex( readBuf ); + lex.SkipSpace(); + TInt value; + err = lex.Val( value ); + if ( err ) + { + break; + } + // IGNORE the Leave + TRAP_IGNORE( aArray->AppendL( value )); + readBuf.Zero(); + } + } + CleanupStack::PopAndDestroy(&file); + if ( !hadFS ) + { + aFileServerSession->Close(); + delete aFileServerSession; + aFileServerSession = NULL; + } + } + diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp --- a/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -22,10 +22,8 @@ #include "ssmlanguageloader.h" #include "syslangutilprivatecrkeys.h" #include "trace.h" -#include "ssmlocalepskeys.h" #include "ssmmapperutilityinternalpskeys.h" -#include #include #include #include @@ -328,15 +326,7 @@ TInt errorCode = iMapperUtility->CrValue( KCRUidCommonEngineKeys, KGSDisplayTxtLang, value ); - if( KErrNone == errorCode ) - { - errorCode = RProperty::Set( KPSStarterUid, KSSMUILanguagePSKey, value ); - ERROR_1( errorCode, "Failed to set read KSSMUILanguagePSKey PS key %d", errorCode ); - } - else - { - INFO_1( "Failed read KGSDisplayTxtLang CenRep key with error= %d", errorCode ); - } + ERROR( errorCode, "Failed read KGSDisplayTxtLang CenRep key with error= %d" ); INFO_1( "Last selected language is %d", value ); return value; @@ -357,16 +347,7 @@ { //Set the Region CR with the given value errorCode = cenrep->Set( KGSRegion, aRegion ); - if ( KErrNone == errorCode ) - { - //Set the Region PS key which is used in Region SUP - TInt err = RProperty::Set( KPSStarterUid, KSSMRegionPSKey, aRegion ); - ERROR( err, "Failed to Set Region PS key"); - } - else - { - INFO_1( "Failed to Set Region code to CentRep, %d", errorCode ); - } + ERROR( errorCode, "Failed to Set Region code to CentRep, %d" ); } else { @@ -377,16 +358,7 @@ { //Set the Collation CR with the given value errorCode = cenrep->Set( KGSCollation, aCollation ); - if ( KErrNone == errorCode ) - { - //Set the Collation PS key which is used in Collation SUP - errorCode = RProperty::Set( KPSStarterUid, KSSMCollationPSKey, aCollation ); - ERROR( errorCode, "Failed to Set Collation PS key " ); - } - else - { - INFO_1( "Failed to Set Collation code to CentRep, %d", errorCode ); - } + ERROR( errorCode, "Failed to Set Collation code to CentRep, %d" ); } delete cenrep; return errorCode; @@ -542,17 +514,11 @@ CleanupStack::PushL( cenrep ); //Get the last selected Region from central repository - User::LeaveIfError(cenrep->Get( KGSRegion, aRegion)); - - //Set the Region PS key which is used in Region SUP - User::LeaveIfError(RProperty::Set( KPSStarterUid, KSSMRegionPSKey, aRegion )); - + User::LeaveIfError(cenrep->Get( KGSRegion, aRegion)); + //Get the last selected Collation from central repository - User::LeaveIfError(cenrep->Get( KGSCollation, aCollation)); + User::LeaveIfError(cenrep->Get( KGSCollation, aCollation)); - //Set the Collation PS key which is used in Collation SUP - User::LeaveIfError(RProperty::Set( KPSStarterUid, KSSMCollationPSKey, aCollation )); - INFO_2( "Last selected region %d and collation %d", aRegion, aCollation ); CleanupStack::PopAndDestroy( cenrep ); } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstarter/group/loadamastart.mmp --- a/sysstatemgmt/systemstarter/group/loadamastart.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstarter/group/loadamastart.mmp Thu Sep 02 21:48:26 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" @@ -24,8 +24,7 @@ userinclude ../inc -systeminclude /epoc32/include -systeminclude /epoc32/include/ssm +OS_LAYER_SYSTEMINCLUDE sourcepath ../amastartsrc diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstarter/inc/loadamastart.h --- a/sysstatemgmt/systemstarter/inc/loadamastart.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstarter/inc/loadamastart.h Thu Sep 02 21:48:26 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,7 +16,7 @@ #ifndef __LOADAMASTART_H__ #define __LOADAMASTART_H__ -#include +#include class CAmaStart; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstarter/src/StartupSplashScreen.cpp --- a/sysstatemgmt/systemstarter/src/StartupSplashScreen.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstarter/src/StartupSplashScreen.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -93,12 +93,14 @@ // Define a splash property to control display and removal of // the splash screen on system start up. - RProperty::Define(KSplashPropertyKey, RProperty::EInt, + // Ignoring the error value. + TInt err = RProperty::Define(KSplashPropertyKey, RProperty::EInt, KSplashReadPolicy, KSplashWritePolicy); - + DEBUGPRINT2(_L("Defining the KSplashPropertyKey completed with %d"), err); + // Create and set off the splash screen process. RProcess splash; - TInt err = splash.Create(*iSplashPath, KNullDesC); + err = splash.Create(*iSplashPath, KNullDesC); if (err == KErrNone) { splash.Resume(); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstarter/test/tamastarter/group/tamastarter_server.mmp --- a/sysstatemgmt/systemstarter/test/tamastarter/group/tamastarter_server.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstarter/test/tamastarter/group/tamastarter_server.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -30,9 +30,6 @@ OS_LAYER_SYSTEMINCLUDE_SYMBIAN MW_LAYER_SYSTEMINCLUDE_SYMBIAN -#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT -SYSTEMINCLUDE /epoc32/include/ssm -#endif // SYMBIAN_SYSTEM_STATE_MANAGEMENT USERINCLUDE ../inc USERINCLUDE ../../../inc diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstarter/test/tamastarter/resource/emulator/tamastarter_amaadder_ssma.rss --- a/sysstatemgmt/systemstarter/test/tamastarter/resource/emulator/tamastarter_amaadder_ssma.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstarter/test/tamastarter/resource/emulator/tamastarter_amaadder_ssma.rss Thu Sep 02 21:48:26 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,9 +16,9 @@ // #include -#include -#include -#include +#include +#include +#include UID2 KUidSsmCommandListResourceFile diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstarter/test/tamastarter/resource/hardware/tamastarter_amaadder_ssma.rss --- a/sysstatemgmt/systemstarter/test/tamastarter/resource/hardware/tamastarter_amaadder_ssma.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstarter/test/tamastarter/resource/hardware/tamastarter_amaadder_ssma.rss Thu Sep 02 21:48:26 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,9 +16,9 @@ // #include -#include -#include -#include +#include +#include +#include UID2 KUidSsmCommandListResourceFile diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistimpl.cpp --- a/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistimpl.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistimpl.cpp Thu Sep 02 21:48:26 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" @@ -430,7 +430,7 @@ User::LeaveIfError(file.Open(rfs, iResourceFileName, EFileRead | EFileShareReadersOnly)); CleanupClosePushL(file); // read entire resource file into a buffer - TInt fileSize; + TInt fileSize(0); User::LeaveIfError(file.Size(fileSize)); RBuf8 buf; buf.CreateL(fileSize); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistresourcereaderimpl.cpp --- a/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistresourcereaderimpl.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistresourcereaderimpl.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -567,7 +567,7 @@ User::LeaveIfError(file.Open(iFs, aFileName, EFileRead | EFileShareReadersOnly)); // read entire resource file into a buffer - TInt fileSize; + TInt fileSize(0); User::LeaveIfError(file.Size(fileSize)); RBuf8 buf; buf.CreateL(fileSize); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatemgr/ssm/src/ssmsession.cpp --- a/sysstatemgmt/systemstatemgr/ssm/src/ssmsession.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/ssm/src/ssmsession.cpp Thu Sep 02 21:48:26 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" @@ -79,7 +79,7 @@ const TUint swpKey = {aMessage.Int0()}; const TInt deslen = aMessage.GetDesLengthL(1); RBuf filename; - filename.Create(deslen); + filename.CreateL(deslen); filename.CleanupClosePushL(); aMessage.ReadL(1, filename); SsmServer()->RequestRegisterSwpMappingL(swpKey, filename); @@ -150,7 +150,7 @@ const TUint swpKey = {aMessage.Int0()}; const TInt length = aMessage.GetDesLengthL(1); RBuf filename; - filename.Create(length); + filename.CreateL(length); filename.CleanupClosePushL(); aMessage.ReadL(1, filename); SsmServer()->RequestDeRegisterSwpMappingL(swpKey, filename); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatemgr/sus/src/susmiscadaptation.cpp --- a/sysstatemgmt/systemstatemgr/sus/src/susmiscadaptation.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatemgr/sus/src/susmiscadaptation.cpp Thu Sep 02 21:48:26 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" @@ -128,7 +128,7 @@ void CMiscAdaptation::DoGetSimLanguagesArrayL(const RMessage2& aMessage) { const TInt simLanguageCount = aMessage.Int1(); - CBufFlat* const buf=CBufFlat::NewL(simLanguageCount * sizeof(TInt32)); + CBufFlat* const buf=CBufFlat::NewL(simLanguageCount * sizeof(TInt)); CleanupStack::PushL(buf); iMiscAdaptation.GetSimLanguagesL(buf, simLanguageCount); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/conditionevaluator/src/cndsystemwideproperty.cpp --- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndsystemwideproperty.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndsystemwideproperty.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -19,6 +19,7 @@ @internalComponent */ +#include "ssmdebug.h" #include "cndsystemwideproperty.h" #include @@ -48,8 +49,9 @@ RSsmSystemWideProperty property; User::LeaveIfError(property.Connect(iKey)); - User::LeaveIfError(property.GetValue(value)); - property.Close(); + CleanupClosePushL(property); + + SSMLOGLEAVEIFERROR(property.GetValue(value)); TBool retVal = EFalse; if (iConditionCheckType == ECompareValue) @@ -60,5 +62,7 @@ { retVal = ((value & iCndValue) == iCndValue); } + + CleanupStack::PopAndDestroy(&property); return retVal; } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicyfail.mmp --- a/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicyfail.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicyfail.mmp Thu Sep 02 21:48:26 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" @@ -16,7 +16,7 @@ #ifdef WINS TARGET ssm.state.policy.0003.dll #else -TARGET ssm.state.policy.hw.0003.dll +TARGET ssm.refrence.state.policy.hw.0003.dll #endif TARGETTYPE dll UID 0x2000D75D 0x20010330 diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicynormal.mmp --- a/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicynormal.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicynormal.mmp Thu Sep 02 21:48:26 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" diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicyshutdown.mmp --- a/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicyshutdown.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicyshutdown.mmp Thu Sep 02 21:48:26 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" @@ -16,7 +16,7 @@ #ifdef WINS TARGET ssm.state.policy.0002.dll #else -TARGET ssm.state.policy.hw.0002.dll +TARGET ssm.refrence.state.policy.hw.0002.dll #endif TARGETTYPE dll UID 0x2000D75D 0x2001032D diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicystartup.mmp --- a/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicystartup.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/gsastatepolicystartup.mmp Thu Sep 02 21:48:26 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" @@ -16,7 +16,7 @@ #ifdef WINS TARGET ssm.state.policy.0000.dll #else -TARGET ssm.state.policy.hw.0000.dll +TARGET ssm.refrence.state.policy.hw.0000.dll #endif TARGETTYPE dll UID 0x2000D75D 0x2000D75F @@ -58,14 +58,6 @@ TARGETPATH /private/2000d75b/startup/8 END -// Launch 'sysstart.exe' if startup resource is not found. If 'sysstart.exe' fails, launch 'sysagt2svr.exe' and 'wserv.exe' -// resource file to fallback to 'sysstart.exe' -// resource file path format : "z:/private//startup/fallback/" -SOURCEPATH ../resource/wins -START RESOURCE fallbacktosysstart.rss -TARGETPATH /private/2000d75b/startup/fallback -END - #else //for hardware// SOURCEPATH ../resource/armv5 diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/gsapolicy/group/sspluginsgsa.iby --- a/sysstatemgmt/systemstateplugins/gsapolicy/group/sspluginsgsa.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/sspluginsgsa.iby Thu Sep 02 21:48:26 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,45 +17,27 @@ #ifndef __SSPLUGINSGSA_IBY__ #define __SSPLUGINSGSA_IBY__ -file=ABI_DIR\BUILD_DIR\ssm.state.policy.hw.0000.dll sys\bin\ssm.state.policy.0000.dll file=ABI_DIR\BUILD_DIR\ssm.state.policy.0001.dll sys\bin\ssm.state.policy.0001.dll -file=ABI_DIR\BUILD_DIR\ssm.state.policy.hw.0002.dll sys\bin\ssm.state.policy.0002.dll -file=ABI_DIR\BUILD_DIR\ssm.state.policy.hw.0003.dll sys\bin\ssm.state.policy.0003.dll -// rsc files for the rom -data=EPOCROOT##epoc32\data\z\private\2000d75b\startup\fallback\fallbacktosysstart_target.rsc private\2000d75b\startup\fallback\fallbacktosysstart.rsc data=EPOCROOT##epoc32\data\z\private\2000d75b\normal\gsanormalcmdlist.rsc private\2000d75b\normal\gsanormalcmdlist.rsc + +// If it is NCP image that is being made (_IMAGE_TYPE_NCP defined)then NCP ssm.state.policy is used. which +// is used for textshell mode only. +#if defined(_IMAGE_TYPE_NCP) +file=ABI_DIR\BUILD_DIR\ssm.refrence.state.policy.hw.0000.dll sys\bin\ssm.state.policy.0000.dll +file=ABI_DIR\BUILD_DIR\ssm.refrence.state.policy.hw.0002.dll sys\bin\ssm.state.policy.0002.dll +file=ABI_DIR\BUILD_DIR\ssm.refrence.state.policy.hw.0003.dll sys\bin\ssm.state.policy.0003.dll + data=EPOCROOT##epoc32\data\z\private\2000d75b\shutdown\gsashutdowncmdlist.rsc private\2000d75b\shutdown\gsashutdowncmdlist.rsc data=EPOCROOT##epoc32\data\z\private\2000d75b\fail\gsafailcmdlist.rsc private\2000d75b\fail\gsafailcmdlist.rsc +#endif //_IMAGE_TYPE_NCP REM Simple startup configuration - install a single resource file REM as the default "mode 0" file. -REM Note this is a Techview specific way of including just the -REM SCL required in the ROM. Licensees are expected to include more -REM than one SCL in their devices. -REM If _STARTUPMODE, _STARTUPMODE1, _STARTUPMODE2 etc. are defined -REM then SysStart fallback should be used so no SCL rss files will be included -REM thus forcing the startup policy to use REM The macro for selecting SCL lists is _SSMSTARTUPMODE -#if (defined(_STARTUPMODE) || \ - defined(_STARTUPMODE0) || \ - defined(_STARTUPMODE1) || \ - defined(_STARTUPMODE2) || \ - defined(_STARTUPMODE3) || \ - defined(_STARTUPMODE4) || \ - defined(_STARTUPMODE5) || \ - defined(_STARTUPMODE8)) - -REM SysStart startup mode defines found, using SysStart startup -WARNING "Use _SSMSTARTUPMODE instead of _STARTUPMODE as it is deprecated." -WARNING "_STARTUPMODE can only be used for testing fallback on SysStart by including sysstart.iby and sysstartconfig.iby in buildrom command " - -#else - -REM No legacy SysStart startup mode defines found, using SSM startup #ifdef _SSMSTARTUPMODE define _2000D75B_MODE _SSMSTARTUPMODE @@ -83,6 +65,4 @@ #endif // SSMA_MINIMAL_BOOT -#endif // Legacy SysStart mode defines not found - #endif // __SSPLUGINSGSA_IBY__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/bld.inf --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/bld.inf Thu Sep 02 21:48:26 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" @@ -24,8 +24,6 @@ PRJ_TESTMMPFILES tgsastatetranfromnormal.mmp -tgsastatetranfromshutdown.mmp -tgsastatetrantoshutdown.mmp tgsastatetranfromstartup.mmp tgsa_i_server.mmp @@ -54,13 +52,8 @@ ../scripts/sspluginstest_tgsa_i_checkepocwind_1.bat /epoc32/release/winscw/urel/z/sspluginstest/sspluginstest_tgsa_i_checkepocwind.bat #endif //SYMBIAN_SSM_FLEXIBLE_MERGE - - -../scripts/sspluginstest_statetrantoshutdown.script z:/sspluginstest/sspluginstest_statetrantoshutdown.script -../scripts/sspluginstest_statetranfromshutdown.script z:/sspluginstest/sspluginstest_statetranfromshutdown.script ../scripts/sspluginstest_statetranfromnormal.script z:/sspluginstest/sspluginstest_statetranfromnormal.script ../scripts/sspluginstest_statetranfromstartup.script z:/sspluginstest/sspluginstest_statetranfromstartup.script -../scripts/sspluginstest_statetranfromstartuptoshutdown.script z:/sspluginstest/sspluginstest_statetranfromstartuptoshutdown.script ../scripts/sspluginstest_duplicatesubstate.script z:/sspluginstest/sspluginstest_duplicatesubstate.script #ifdef SYMBIAN_SSM_FLEXIBLE_MERGE ../scripts/sspluginstest_fleximergediffsubstate.script z:/sspluginstest/sspluginstest_fleximergediffsubstate.script @@ -71,8 +64,9 @@ //iby files fleximergediffsubstate.iby /epoc32/rom/include/fleximergediffsubstate.iby -fleximergemanyfiles.iby /epoc32/rom/include/fleximergemanyfiles.iby +fleximergemanyfiles.iby /epoc32/rom/include/fleximergemanyfiles.iby fleximergesamesubstate.iby /epoc32/rom/include/fleximergesamesubstate.iby fleximergesortdifffile.iby /epoc32/rom/include/fleximergesortdifffile.iby fleximergesortsamefile.iby /epoc32/rom/include/fleximergesortsamefile.iby +teststatetransition.iby /epoc32/rom/include/teststatetransition.iby #endif diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/teststatetransition.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/teststatetransition.iby Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,31 @@ +// Copyright (c) 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: +// Iby to export exes, rscs and scripts related to state transition from startup and normal states. + +#ifndef __TESTSTATETRANSITION_IBY__ +#define __TESTSTATETRANSITION_IBY__ + +//server +data=ABI_DIR\DEBUG_DIR\tgsa_i_server.exe sys\bin\tgsa_i_server.exe +data=ABI_DIR\DEBUG_DIR\tgsastatetranfromnormal.exe sys\bin\tgsastatetranfromnormal.exe +data=ABI_DIR\DEBUG_DIR\tgsastatetranfromstartup.exe sys\bin\tgsastatetranfromstartup.exe + +// script files +data=DATAZ_\sspluginstest\sspluginstest_statetranfromnormal.script \sspluginstest\sspluginstest_statetranfromnormal.script +data=DATAZ_\sspluginstest\sspluginstest_statetranfromstartup.script \sspluginstest\sspluginstest_statetranfromstartup.script + +//rsc files +data=MULTI_LINGUIFY(RSC EPOCROOT##epoc32\data\z\private\2000d75b\test\tgsa_statetransition private\2000d75b\startup\0\tgsa_statetransition) + +#endif // __TESTSTATETRANSITION_IBY__ \ No newline at end of file diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsa_i_server.mmp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsa_i_server.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsa_i_server.mmp Thu Sep 02 21:48:26 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" @@ -31,6 +31,7 @@ USERINCLUDE ../inc USERINCLUDE ../../../gsapolicy/inc USERINCLUDE ../../../localinc +USERINCLUDE ../../../../inc #ifdef SYMBIAN_SSM_FLEXIBLE_MERGE USERINCLUDE ../../testapps/inc diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromnormal.mmp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromnormal.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromnormal.mmp Thu Sep 02 21:48:26 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" @@ -22,12 +22,10 @@ UID 0xA0009DF5 VENDORID 0x70000001 -#if defined(WINS) SOURCEPATH ../resource -START RESOURCE tgsa_statetranfromnormal.rss +START RESOURCE tgsa_statetransition.rss TARGETPATH /private/2000d75b/test END -#endif SOURCEPATH ../src SOURCE tgsastatetran_base.cpp @@ -35,6 +33,7 @@ USERINCLUDE . USERINCLUDE ../inc +USERINCLUDE ../../../../inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromshutdown.mmp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromshutdown.mmp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -TARGET tgsastatetranfromshutdown.exe -TARGETTYPE exe -TARGETPATH /sys/bin - -CAPABILITY PowerMgmt - -UID 0xA0009DF3 -VENDORID 0x70000001 - -#if defined(WINS) -SOURCEPATH ../resource -START RESOURCE tgsa_statetranfromshutdown.rss -TARGETPATH /private/2000d75b/test -END -#endif - -SOURCEPATH ../src -SOURCE tgsastatetran_base.cpp -SOURCE tgsastatetranfromshutdown.cpp - -USERINCLUDE . -USERINCLUDE ../inc - - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib ssmcmn.lib efsrv.lib estor.lib - - - - - - - - - -SMPSAFE diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromstartup.mmp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromstartup.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetranfromstartup.mmp Thu Sep 02 21:48:26 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" @@ -22,25 +22,18 @@ UID 0xA000A180 VENDORID 0x70000001 -#if defined(WINS) -SOURCEPATH ../resource -START RESOURCE tgsa_statetranfromstartup.rss -TARGETPATH /private/2000d75b/test -END - -SOURCEPATH ../resource -START RESOURCE tgsa_statetranfromstartuptoshutdown.rss -TARGETPATH /private/2000d75b/test -END - -#endif - SOURCEPATH ../src SOURCE tgsastatetran_base.cpp SOURCE tgsastatetranfromstartup.cpp +SOURCEPATH ../resource +START RESOURCE tgsa_statetransition.rss +TARGETPATH /private/2000d75b/test +END + USERINCLUDE . USERINCLUDE ../inc +USERINCLUDE ../../../../inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetrantoshutdown.mmp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/group/tgsastatetrantoshutdown.mmp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -TARGET tgsastatetrantoshutdown.exe -TARGETTYPE exe -TARGETPATH /sys/bin - -CAPABILITY PowerMgmt - -UID 0xA0009DF4 -VENDORID 0x70000001 - -#if defined(WINS) -SOURCEPATH ../resource -START RESOURCE tgsa_statetrantoshutdown.rss -TARGETPATH /private/2000d75b/test -END -#endif - -SOURCEPATH ../src -SOURCE tgsastatetran_base.cpp -SOURCE tgsastatetrantoshutdown.cpp - -USERINCLUDE . -USERINCLUDE ../inc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib ssmcmn.lib efsrv.lib estor.lib - - - -SMPSAFE diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/inc/tgsa_step_statetrantodiffstates.h --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/inc/tgsa_step_statetrantodiffstates.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/inc/tgsa_step_statetrantodiffstates.h Thu Sep 02 21:48:26 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" @@ -26,11 +26,8 @@ #include #include -_LIT(KTGsaStateTranToShutdownStep,"GsaStateTranToShutdownStep"); -_LIT(KTGsaStateTranFromShutdownStep,"GsaStateTranFromShutdownStep"); _LIT(KTGsaStateTranFromNormalStep,"GsaStateTranFromNormalStep"); _LIT(KTGsaStateTranFromStartupStep,"GsaStateTranFromStartupStep"); -_LIT(KTGsaStateTranFromStartuptoShutdownStep,"GsaStateTranFromStartuptoShutdownStep"); class CGsaStateTranToDiffStatesTest : public CTestStep { diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_1.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_1.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_1.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_10.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_10.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_10.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_11.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_11.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_11.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_12.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_12.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_12.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_13.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_13.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_13.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_14.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_14.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_14.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_15.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_15.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_15.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_16.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_16.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_16.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_17.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_17.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_17.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_18.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_18.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_18.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_19.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_19.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_19.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_2.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_2.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_2.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_20.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_20.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_20.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_21.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_21.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_21.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_22.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_22.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_22.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_23.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_23.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_23.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_24.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_24.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_24.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_25.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_25.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_25.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_26.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_26.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_26.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_27.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_27.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_27.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_28.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_28.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_28.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_29.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_29.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_29.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_3.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_3.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_3.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_30.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_30.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_30.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_31.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_31.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_31.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_32.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_32.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_32.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_33.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_33.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_33.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_34.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_34.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_34.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_35.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_35.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_35.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_36.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_36.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_36.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_37.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_37.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_37.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_38.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_38.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_38.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_39.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_39.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_39.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_4.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_4.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_4.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_40.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_40.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_40.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_41.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_41.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_41.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_42.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_42.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_42.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_43.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_43.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_43.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_44.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_44.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_44.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_45.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_45.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_45.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_46.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_46.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_46.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_47.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_47.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_47.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_48.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_48.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_48.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_49.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_49.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_49.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_5.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_5.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_5.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_50.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_50.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_50.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_6.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_6.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_6.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_7.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_7.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_7.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_8.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_8.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_8.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_9.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_9.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/fiftyrss/tgsa_flexiblemerge_9.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_diffss1.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_diffss1.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_diffss1.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,29 +38,23 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = 0x50; - resource_id = r_non_critical_commands; + command_list_id = ESsmStateSecurityCheck; + resource_id = r_security_check_commands; } }; } -RESOURCE SSM_COMMAND_LIST r_non_critical_commands +RESOURCE SSM_COMMAND_LIST r_security_check_commands { commands = { - r_command_publish_system_state - , r_command_test_proc + r_command_test_proc }; } -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - priority = 150; - } - RESOURCE SSM_START_APP_INFO r_command_test_proc { + priority = 150; severity = ECmdCriticalSeverity; name = "gsatestprocgood.exe"; execution_behaviour = ESsmWaitForSignal; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_diffss2.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_diffss2.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_diffss2.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = 0x51; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; @@ -47,19 +48,13 @@ { commands = { - r_command_publish_system_state - , r_command_test_proc + r_command_test_proc }; } -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - priority = 150; - } - RESOURCE SSM_START_APP_INFO r_command_test_proc { + priority = 150; severity = ECmdCriticalSeverity; name = "gsatestprocgood.exe"; execution_behaviour = ESsmWaitForSignal; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_samess.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_samess.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_samess.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = ESsmStartupSubStateNonCritical; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortdifffile1.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortdifffile1.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortdifffile1.rss Thu Sep 02 21:48:26 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" @@ -19,6 +19,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -36,7 +37,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = 0x49; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; @@ -46,19 +47,13 @@ { commands = { - r_command_test_app - ,r_command_publish_system_state + r_command_test_app ,r_command_test_proc1 ,r_command_test_proc2 ,r_command_multiple_wait }; } -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - priority = 10; - } RESOURCE SSM_START_APP_INFO r_command_test_app { diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortdifffile2.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortdifffile2.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortdifffile2.rss Thu Sep 02 21:48:26 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" @@ -19,6 +19,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -36,7 +37,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = 0x49; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortsamefile.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortsamefile.rss Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_flexiblemerge_sortsamefile.rss Thu Sep 02 21:48:26 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" @@ -20,6 +20,7 @@ #include #include +#include "ssmsubstateext.hrh" UID2 KUidSsmCommandListResourceFile @@ -37,7 +38,7 @@ { SSM_COMMANDLISTID_TO_RESOURCEID { - command_list_id = 0x49; + command_list_id = ESsmStateNonCritical; resource_id = r_non_critical_commands; } }; @@ -48,16 +49,10 @@ commands = { r_command_test_app - , r_command_publish_system_state , r_command_test_proc }; } -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - priority = 150; - } RESOURCE SSM_START_APP_INFO r_command_test_app { diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromnormal.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromnormal.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -// Copyright (c) 2007-2009 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: -// - -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = 0x48; - resource_id = r_testapp_command; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_testapp_command - { - commands = - { - r_command_publish_state - , r_command_statetranfromnormal - }; - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_statetranfromnormal - { - severity = ECmdCriticalSeverity; - name = "tgsastatetranfromnormal.exe"; - execution_behaviour = ESsmFireAndForget; - } - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromshutdown.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromshutdown.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -// Copyright (c) 2007-2009 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: -// - -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = 0x48; - resource_id = r_testapp_command; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_testapp_command - { - commands = - { - r_command_publish_state - , r_command_statetranfromshutdown - }; - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_statetranfromshutdown - { - severity = ECmdCriticalSeverity; - name = "tgsastatetranfromshutdown.exe"; - execution_behaviour = ESsmFireAndForget; - } - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromstartup.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromstartup.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -// Copyright (c) 2007-2009 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: -// - -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = 0x48; - resource_id = r_testapp_command; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_testapp_command - { - commands = - { - r_command_publish_state - , r_command_statetranfromstartup - }; - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_statetranfromstartup - { - severity = ECmdCriticalSeverity; - name = "tgsastatetranfromstartup.exe"; - execution_behaviour = ESsmWaitForSignal; - } - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromstartuptoshutdown.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetranfromstartuptoshutdown.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -// Copyright (c) 2007-2009 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: -// tgsa_statetranfromstartup.rss -// -// - -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = 0x48; - resource_id = r_testapp_command; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_testapp_command - { - commands = - { - r_command_publish_state - , r_command_statetranfromstartup_shutdown - }; - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_statetranfromstartup_shutdown - { - severity = ECmdCriticalSeverity; - name = "tgsastatetranfromstartup.exe"; - args = "shutdown"; - execution_behaviour = ESsmWaitForSignal; - } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetransition.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetransition.rss Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,64 @@ +// Copyright (c) 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: +// + +#include +#include +#include "ssmsubstateext.hrh" + +UID2 KUidSsmCommandListResourceFile + +// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. +// The SSM relies on this having a resource ID of 1. +RESOURCE SSM_COMMAND_LIST_ROOT + { + command_list_mapping = r_command_list_mapping; + } + +RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping + { + mappings = + { + SSM_COMMANDLISTID_TO_RESOURCEID + { + command_list_id = ESsmStateNonCritical; + resource_id = r_testapp_command; + } + }; + } + + +RESOURCE SSM_COMMAND_LIST r_testapp_command + { + commands = + { + r_command_statetranfromnormal, + r_command_statetranfromstartup + }; + } + + +RESOURCE SSM_START_PROCESS_INFO r_command_statetranfromnormal + { + severity = ECmdCriticalSeverity; + name = "tgsastatetranfromnormal.exe"; + execution_behaviour = ESsmFireAndForget; + } + +RESOURCE SSM_START_PROCESS_INFO r_command_statetranfromstartup + { + severity = ECmdCriticalSeverity; + name = "tgsastatetranfromstartup.exe"; + execution_behaviour = ESsmWaitForSignal; + } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetrantoshutdown.rss --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/resource/tgsa_statetrantoshutdown.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -// Copyright (c) 2007-2009 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: -// - -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = 0x48; - resource_id = r_testapp_command; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_testapp_command - { - commands = - { - r_command_publish_state - , r_command_statetrantoshutdown - }; - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_statetrantoshutdown - { - severity = ECmdCriticalSeverity; - name = "tgsastatetrantoshutdown.exe"; - execution_behaviour = ESsmFireAndForget; - } - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/scripts/sspluginstest_statetranfromshutdown.script --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/scripts/sspluginstest_statetranfromshutdown.script Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -PRINT Run GsaStateTranFromShutdownStep tests - -LOAD_SUITE tgsa_i_server - -START_TESTCASE DEVSRVS-SSPLUGINS-GSA-0033 -//! @SYMTestCaseID DEVSRVS-SSPLUGINS-GSA-0033 -//! @SYMDEF DEF119568 -//! @SYMTestCaseDesc Checks for state transitions to fail and shutdown states from normal state -//! under different scenarios. -//! @SYMTestType CIT -//! @SYMTestPriority Critical -//! @SYMTestActions Test checks the results for request state transition under different scenarios: -//! 1. Normal state to Shutdown state and then to Fail state. -//! Scenario 1 - Request for state change from Normal to shutdown state to critical substate -//! Cancel the request immediately -//! Scenario 2 - Request for state change from Normal to shutdown state to any substate -//! Cancel the request immediately, so that we can proceed with the next test scenario. -//! Scenario 3 - Request for three state changes(1. shutdown state 2. invalid state 3. fail state) one after the other -//! i.e., second request is issued once first one is completed and the third one is issued after the second request is completed. -//! Cancel the third request. -//! Scenario 4 - The system is now in shutdown state, request for state transition to normal state. -//! Scenario 5 - The system is now in shutdown state, request for state transition to fail state. -//! @SYMTestExpectedResults -//! 1. Normal state to Shutdown state and then to Fail state. -//! Scenario 1 - Request will be completed with KErrCancel -//! Scenario 2 - Request will be completed with KErrCancel -//! Scenario 3 - First request will completed with KErrNone -//! Second request will completed with KErrNotSupported -//! Third request will completed with KErrCancel -//! Scenario 4 - Request will be completed with KErrNotSupported -//! Scenario 5 - Request will be completed with KErrNone -RUN_TEST_STEP 100 tgsa_i_server GsaStateTranFromShutdownStep -END_TESTCASE DEVSRVS-SSPLUGINS-GSA-0033 diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/scripts/sspluginstest_statetranfromstartuptoshutdown.script --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/scripts/sspluginstest_statetranfromstartuptoshutdown.script Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -PRINT Run GsaStateTranFromStartupStep tests - -LOAD_SUITE tgsa_i_server - -START_TESTCASE DEVSRVS-SSPLUGINS-GSA-0036 -//! @SYMTestCaseID DEVSRVS-SSPLUGINS-GSA-0036 -//! @SYMDEF DEF130922 -//! @SYMTestCaseDesc Checks for state transitions to shutdown states from Startup state -//! under different scenarios. -//! @SYMTestType CIT -//! @SYMTestPriority Critical -//! @SYMTestActions Test checks the result for request state transition from Startup to Shutdown Critical State -//! 1. Startup state to Shutdown state. -//! Scenario 1 - Request for state change from Startup to critical state -//! @SYMTestExpectedResults 1. Startup state to Shutdown state. -//! Scenario 1 - Request will completed with KErrNone -RUN_TEST_STEP 100 tgsa_i_server GsaStateTranFromStartuptoShutdownStep -END_TESTCASE DEVSRVS-SSPLUGINS-GSA-0036 diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/scripts/sspluginstest_statetrantoshutdown.script --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/scripts/sspluginstest_statetrantoshutdown.script Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -PRINT Run GsaStateTranToShutdownStep tests - -LOAD_SUITE tgsa_i_server - -START_TESTCASE DEVSRVS-SSPLUGINS-GSA-0035 -//! @SYMTestCaseID DEVSRVS-SSPLUGINS-GSA-0035 -//! @SYMDEF DEF119568 -//! @SYMTestCaseDesc Checks for state transitions to fail and shutdown states from normal state -//! under different scenarios. -//! @SYMTestType CIT -//! @SYMTestPriority Critical -//! @SYMTestActions Test checks the results for request state transition under different scenarios: -//! 1. Normal state to Shutdown state. -//! Scenario 1 - Request for state transition to shutdown state - invalid substate -//! Scenario 2 - Request for state transition to shutdown state - critical substate(Restart) -//! Scenario 3 - Request for state transition to shutdown state - critical substate(Standby) -//! @SYMTestExpectedResults 1. Normal state to Shutdown state. -//! Scenario 1 - Request to transit to the shutdown state will be completed with KErrNotSupported -//! Scenario 2 - First request will be completed with KErrNone -//! Second request will be completed with KErrNotSupported -RUN_TEST_STEP 100 tgsa_i_server GsaStateTranToShutdownStep -END_TESTCASE DEVSRVS-SSPLUGINS-GSA-0035 diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsa_i_server.cpp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsa_i_server.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsa_i_server.cpp Thu Sep 02 21:48:26 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" @@ -90,15 +90,7 @@ //Following tests can be run only on techview emulator as it requires restarting of the emulator //#ifdef __WINS__ CTestStep* testStep = NULL; - if (aStepName == KTGsaStateTranToShutdownStep) - { - testStep = new CGsaStateTranToDiffStatesTest(KTestProcTranToShutdown); - } - else if (aStepName == KTGsaStateTranFromShutdownStep) - { - testStep = new CGsaStateTranToDiffStatesTest(KTestProcTranFromShutdown); - } - else if (aStepName == KTGsaStateTranFromNormalStep) + if (aStepName == KTGsaStateTranFromNormalStep) { testStep = new CGsaStateTranToDiffStatesTest(KTestProcTranFromNormal); } @@ -106,10 +98,6 @@ { testStep = new CGsaStateTranToDiffStatesTest(KTestProcTranFromStartup); } - else if (aStepName == KTGsaStateTranFromStartuptoShutdownStep) - { - testStep = new CGsaStateTranToDiffStatesTest(KTGsaStateTranFromStartuptoShutdownStep); - } else if (aStepName == KTGsaDuplicateSubstateStep) { testStep = new CGsaDuplicateSubstateTest(); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsa_step_statetrantodiffstates.cpp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsa_step_statetrantodiffstates.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsa_step_statetrantodiffstates.cpp Thu Sep 02 21:48:26 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" @@ -46,202 +46,101 @@ if (iProcessName == KTestProcTranFromNormal) { - RFileReadStream fileReadStream; - err = fileReadStream.Open(fs, KGsaTestStateTranFromNormalResult, EFileRead); + RFileReadStream fileReadStream1; + err = fileReadStream1.Open(fs, KGsaTestStateTranFromNormalResult, EFileRead); + INFO_PRINTF2(_L("Error in opening file: %d"), err); TEST(err == KErrNone); User::LeaveIfError(err); - CleanupClosePushL(fileReadStream); + CleanupClosePushL(fileReadStream1); //System state before starting the test. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream1, ESsmNormal); //Scenario 1 - Request for state change from Normal to invalid state results in KErrNotSupported INFO_PRINTF1(_L("Request for state change from Normal to invalid state")); - TInt stateTranResult = fileReadStream.ReadInt32L(); + TInt stateTranResult = fileReadStream1.ReadInt32L(); TEST(stateTranResult == KErrNotSupported); INFO_PRINTF2(_L("Actual : %d Expected : -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream1, ESsmNormal); //Scenario 2 - Request for state change from Normal to fail state with invalid substate results in KErrNotSupported INFO_PRINTF1(_L("Request for state change from Normal to fail state with invalid substate")); - stateTranResult = fileReadStream.ReadInt32L(); + stateTranResult = fileReadStream1.ReadInt32L(); TEST(stateTranResult == KErrNotSupported); INFO_PRINTF2(_L("Actual : %d Expected : -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream1, ESsmNormal); //Scenario 3 - Request for two state changes(1. fail state 2. shutdown state) one after the other without waiting // for the first one to complete. Cancels both transition request. INFO_PRINTF1(_L("Request for two state changes(1. fail state 2. shutdown state)")); INFO_PRINTF1(_L("one after the other without waiting for the first one to complete.")); INFO_PRINTF1(_L("Cancel the fail state transition request.")); - stateTranResult = fileReadStream.ReadInt32L(); + stateTranResult = fileReadStream1.ReadInt32L(); TEST(stateTranResult == KErrCancel); INFO_PRINTF2(_L("First request to the fail state will be completed with %d Expected -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream1, ESsmNormal); - stateTranResult = fileReadStream.ReadInt32L(); + stateTranResult = fileReadStream1.ReadInt32L(); TEST(stateTranResult == KErrCancel); INFO_PRINTF2(_L("Second request to transit to the shutdown state will be completed with %d Expected -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - //Scenario 4 - Request for two state changes one after the other without waiting for the first one to complete - // Once first and second request are completed the system will be in fail state, now issue another state transition - // request to fail state again. - // The first request to the fail state will be completed with KErrCancel - // the second request to transit to the fail state will be completed with KErrNone. - // the third request to transit to the fail state will be completed with KErrNotSupported. - INFO_PRINTF1(_L("Request for two state changes one after the other without waiting")); - INFO_PRINTF1(_L("for the first one to complete. Once first and second request are completed the system will be in")); - INFO_PRINTF1(_L("fail state, now issue another state transition request to fail state again.")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrCancel); - INFO_PRINTF2(_L("First request to the fail state will be completed with %d Expected -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream1, ESsmNormal); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone); - INFO_PRINTF2(_L("Second request to the fail state will be completed with %d Expected 0"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNotSupported); - INFO_PRINTF2(_L("Third request to the fail state will be completed with %d Expected -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - //Finally the system should be in fail state i.e., just before the test application is closed. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmFail); - INFO_PRINTF1(_L("Test Process Exit Reason")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone && stateTranResult != KTestAppFailure); - INFO_PRINTF2(_L("Test process exits with %d Expected 0"), stateTranResult); + INFO_PRINTF2(_L("Test process exits with %d Expected -3"), stateTranResult); CleanupStack::PopAndDestroy(); // Delete the result file //err = fs.Delete(KGsaTestStateTranFromNormalResult); - } - else if (iProcessName == KTestProcTranToShutdown) - { - RFileReadStream fileReadStream; - err = fileReadStream.Open(fs, KGsaTestStateTranToShutdownResult, EFileRead); + + RFileReadStream fileReadStream2; + err = fileReadStream2.Open(fs, KGsaTestStateTranToShutdownResult, EFileRead); TEST(err == KErrNone); User::LeaveIfError(err); - CleanupClosePushL(fileReadStream); + CleanupClosePushL(fileReadStream2); //System state before starting the test. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream2, ESsmNormal); //Scenario 1 - Request for state transition to shutdown state - invalid substate // request to transit to the shutdown state will be completed with KErrNotSupported INFO_PRINTF1(_L("Request for state transition to shutdown state - invalid substate")); - TInt stateTranResult = fileReadStream.ReadInt32L(); + stateTranResult = fileReadStream2.ReadInt32L(); TEST(stateTranResult == KErrNotSupported); INFO_PRINTF2(_L("Actual : %d Expected : -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream2, ESsmNormal); - //Scenario 2 - Request for state transition to shutdown state - critical substate(Restart) - // Request for state transition to shutdown state - critical substate(Standby) - // first request to transit to the shutdown state critical substate(Restart)will be completed with KErrCancel - // second request to transit to the shutdown state critical substate(Standby)will be completed with KErrNone - INFO_PRINTF1(_L("Request for state transition to shutdown state - critical substate(Standby)")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone); - INFO_PRINTF2(_L("Actual : %d Expected : 0"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - INFO_PRINTF1(_L("Request for state transition to shutdown state - critical substate(Restart)")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrCancel); - INFO_PRINTF2(_L("Actual : %d Expected : -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - //Finally the system should be in fail state i.e., just before the test application is closed. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmShutdown); - - INFO_PRINTF1(_L("Test Process Exit Reason")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone && stateTranResult != KTestAppFailure); - INFO_PRINTF2(_L("Test process exits with %d Expected 0"), stateTranResult); + INFO_PRINTF2(_L("Test process exits with %d Expected -5"), stateTranResult); CleanupStack::PopAndDestroy(); // Delete the result file //err = fs.Delete(KGsaTestStateTranToShutdownResult); - } - else if (iProcessName == KTestProcTranFromShutdown) - { - RFileReadStream fileReadStream; - err = fileReadStream.Open(fs, KGsaTestStateTranFromShutdownResult, EFileRead); + + RFileReadStream fileReadStream3; + err = fileReadStream3.Open(fs, KGsaTestStateTranFromShutdownResult, EFileRead); TEST(err == KErrNone); User::LeaveIfError(err); - CleanupClosePushL(fileReadStream); + CleanupClosePushL(fileReadStream3); //System state before starting the test. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream3, ESsmNormal); //Scenario 1 - Request for state change from Normal to shutdown state to critical substate // Cancel the request immediately INFO_PRINTF1(_L("Request for state change from Normal to shutdown critical substate and Cancel the request")); - TInt stateTranResult = fileReadStream.ReadInt32L(); + stateTranResult = fileReadStream3.ReadInt32L(); TEST(stateTranResult == KErrCancel); INFO_PRINTF2(_L("Actual : %d Expected : -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream3, ESsmNormal); //Scenario 2 - Request for state change from Normal to shutdown state to any substate // Cancel the request immediately, so that we can proceed with the next test scenario. INFO_PRINTF1(_L("Request for state change from Normal to shutdown any substate and Cancel the request")); - stateTranResult = fileReadStream.ReadInt32L(); + stateTranResult = fileReadStream3.ReadInt32L(); TEST(stateTranResult == KErrCancel); INFO_PRINTF2(_L("Actual : %d Expected : -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - //Scenario 3 - Request for three state changes(1. shutdown state 2. invalid state 3. fail state) one after the other - // i.e., second request is issued once first one is completed and the third one is issued after the second request is completed. - // Cancel the third request. - // first request to the shutdown state will be completed with KErrNone - // second request to transit to the fail state will be completed with KErrNotSupported - // third request to transit to the fail state will be completed with KErrCancel - INFO_PRINTF1(_L("Request for 3 state changes(1. shutdown state 2. invalid state 3. fail state)")); - INFO_PRINTF1(_L("one after the other. i.e., second request is issued once first one is completed")); - INFO_PRINTF1(_L("and the third one is issued after the second request is completed.")); - INFO_PRINTF1(_L("Cancel the third request.")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone); - INFO_PRINTF2(_L("First request to the shutdown state will be completed with %d Expected 0"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); - - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNotSupported); - INFO_PRINTF2(_L("Second request to transit to the fail state will be completed with %d Expected -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmNormal); + CurrentSystemStateForStateTranTestL(fileReadStream3, ESsmNormal); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrCancel); - INFO_PRINTF2(_L("Third request to transit to the fail state will be completed with %d Expected -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmShutdown); - - //Scenario 4 - The system is now in shutdown state, request for state transition to normal state. - // request to transit to the normal state will be completed with KErrNotSupported - INFO_PRINTF1(_L("The system is now in shutdown state, request for state transition to normal state")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNotSupported); - INFO_PRINTF2(_L("Request to transit to the normal state will be completed with %d Expected -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmShutdown); - - //Scenario 5 - The system is now in shutdown state, request for state transition to fail state. - // request to transit to the fail state will be completed with KErrNone - INFO_PRINTF1(_L("The system is now in shutdown state, request for state transition to fail state")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone); - INFO_PRINTF2(_L("Request to transit to the normal state will be completed with %d Expected 0"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmShutdown); - - //Finally the system should be in fail state i.e., just before the test application is closed. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmFail); - - INFO_PRINTF1(_L("Test Process Exit Reason")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone && stateTranResult != KTestAppFailure); - INFO_PRINTF2(_L("Test process exits with %d Expected 0"), stateTranResult); + INFO_PRINTF2(_L("Test process exits with %d Expected -3"), stateTranResult); CleanupStack::PopAndDestroy(); // Delete the result file @@ -265,68 +164,12 @@ INFO_PRINTF2(_L("Actual : %d Expected : -5"), stateTranResult); CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - //Scenario 2 - Request for state change from Startup to fail state with invalid substate - INFO_PRINTF1(_L("Request for state change from Startup to fail state with invalid substate")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNotSupported); - INFO_PRINTF2(_L("Actual : %d Expected : -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - - //Scenario 3 - Request for state change from Startup to shutdown invalid substate - INFO_PRINTF1(_L("Request for state change from Startup to shutdown invalid substate")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNotSupported); - INFO_PRINTF2(_L("Request for state change from Startup to shutdown invalid state completed with %d Expected -5"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - - //Scenario 4 - Request for two state changes to fail state one after the other - //The first request to the fail state will be completed with KErrCancel and the second request to transit to the fail state will be completed with KErrNone. - INFO_PRINTF1(_L("Request for two state changes to fail state one after the other")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrCancel); - INFO_PRINTF2(_L("First request to the fail state will be completed with %d Expected -3"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone); - INFO_PRINTF2(_L("Second request to the fail state will be completed with %d Expected 0"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - - //Finally the system should be in fail state i.e., just before the test application is closed. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmFail); - INFO_PRINTF1(_L("Test Process Exit Reason")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone && stateTranResult != KTestAppFailure); - INFO_PRINTF2(_L("Test process exits with %d Expected 0"), stateTranResult); + INFO_PRINTF2(_L("Test process exits with %d Expected -5"), stateTranResult); CleanupStack::PopAndDestroy(); // Delete the result file //err = fs.Delete(KGsaTestStateTranFromStartupResult); } - else if (iProcessName == KTGsaStateTranFromStartuptoShutdownStep) - { - RFileReadStream fileReadStream; - User::LeaveIfError(fileReadStream.Open(fs, KGsaTestStateTranFromStartupResult, EFileRead)); - CleanupClosePushL(fileReadStream); - - //Scenario 1 - Request for state change from Startup to shutdown critical substate - INFO_PRINTF1(_L("Request for state change from Startup to shutdown critical substate")); - TInt stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone); - INFO_PRINTF2(_L("Request for state change from Startup to shutdown critical substate completed with %d Expected 0"), stateTranResult); - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmStartup); - - //Finally the system should be in Shutdown state i.e., just before the test application is closed. - CurrentSystemStateForStateTranTestL(fileReadStream, ESsmShutdown); - INFO_PRINTF1(_L("Test Process Exit Reason")); - stateTranResult = fileReadStream.ReadInt32L(); - TEST(stateTranResult == KErrNone && stateTranResult != KTestAppFailure); - INFO_PRINTF2(_L("Test process exits with %d Expected 0"), stateTranResult); - - CleanupStack::PopAndDestroy(); - } else { TEST(err == KErrArgument); @@ -359,16 +202,10 @@ CGsaStateTranToDiffStatesTest::CGsaStateTranToDiffStatesTest(const TDesC& aProcessName) : iProcessName(aProcessName) { - if (iProcessName == KTestProcTranToShutdown) - SetTestStepName(KTGsaStateTranToShutdownStep); - else if (iProcessName == KTestProcTranFromShutdown) - SetTestStepName(KTGsaStateTranFromShutdownStep); - else if (iProcessName == KTestProcTranFromNormal) + if (iProcessName == KTestProcTranFromNormal) SetTestStepName(KTGsaStateTranFromNormalStep); else if (iProcessName == KTestProcTranFromStartup) SetTestStepName(KTGsaStateTranFromStartupStep); - else if (iProcessName == KTGsaStateTranFromStartuptoShutdownStep) - SetTestStepName(KTGsaStateTranFromStartuptoShutdownStep); else { diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromnormal.cpp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromnormal.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromnormal.cpp Thu Sep 02 21:48:26 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" @@ -46,12 +46,7 @@ void DoTestStateTranFromNormalL(); }; -static TInt StopScheduler(TAny* aStateTranFromNormal) - { - CStateTranFromNormal* stateTran = reinterpret_cast(aStateTranFromNormal); - TRAPD(err,stateTran->CallStopSchedulerL()); - return err; - } + static TInt StartTest(TAny* aStateTranFromNormal) { @@ -87,16 +82,9 @@ // Tests the Fail state transitions under different scenarios void CStateTranFromNormal::DoTestStateTranFromNormalL() { - // This async callback is used to stop the scheduler once the system goes into fail state. - iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack stopSchedulerCallback(StopScheduler, this); - iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); - - // call the callback function which keeps looping until the system state gets into fail state. - iAsyncCallbackForStopScheduler->CallBack(); - RSsmStateManager stateMan; TInt err = stateMan.Connect(); + CleanupClosePushL(stateMan); if (err == KErrNone) RDebug::Print(_L("\nStateTran Test: RSsmStateManager sess Connect %d\n"), err); else @@ -201,62 +189,92 @@ RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Normal to shutdown state Failed")); User::Leave(KTestAppFailure); } - - //Scenario 4 - Request for two state changes one after the other without waiting for the first one to complete - // Once first and second request are completed the system will be in fail state, now issue another state transition - // request to fail state again. - // The first request to the fail state will be completed with KErrCancel - // the second request to transit to the fail state will be completed with KErrNone. - // the third request to transit to the fail state will be completed with KErrNotSupported. - RDebug::Print(_L("\nStateTran Test: Scenario 4 \n")); - stateMan.RequestStateTransition(stateTrans3, status1); - RDebug::Print(_L("\nStateTran Test: Start First RequestStateTransition from Normal to fail state %d\n "), status1.Int()); + iFileWriteStream.Close(); - stateMan.RequestStateTransition(stateTrans3, status2); - RDebug::Print(_L("\nStateTran Test: Start Second RequestStateTransition from Normal to fail state %d\n "), status2.Int()); + // Creates and open the result file for streaming + err = iFileWriteStream.Replace(iFs, KGsaTestStateTranFromShutdownResult, EFileWrite); + RDebug::Print(_L("\nStateTran Test: iFileWriteStream open with %d\n"), err); + + + // Gets the Current system state before starting the test + CurrentSystemStateL(); + + //Scenario 1 - Request for state change from Normal to shutdown state to critical substate + // Cancel the request immediately + RDebug::Print(_L("\nScenario 1 \n")); + TRequestStatus status_shutdowncritsubstate; + /*TSsmState shutdownState_Critical(ESsmShutdown, ESsmShutdownSubStateCritical); + TSsmStateTransition stateTrans_Shutdowncritical(shutdownState_Critical, 1);*/ + + stateMan.RequestStateTransition(stateTrans_Shutdowncritical, status_shutdowncritsubstate); + RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate %d\n "), status_shutdowncritsubstate.Int()); - User::WaitForRequest(status1); - iFileWriteStream.WriteInt32L(status1.Int()); - if (status1.Int() == KErrCancel) - { - RDebug::Print(_L("\nStateTran Test: First RequestStateTransition from Normal to fail state completes with %d Expected -3\n "), status1.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Test: First RequestStateTransition from Normal to fail state Failed")); - User::Leave(KTestAppFailure); - } + stateMan.RequestStateTransitionCancel(); + + iFileWriteStream.WriteInt32L(status_shutdowncritsubstate.Int()); + if (status_shutdowncritsubstate.Int() == KErrCancel) + { + CurrentSystemStateL(); + RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate completed %d Expected -3\n "), status_shutdowncritsubstate.Int()); + } + else + User::Leave(KTestAppFailure); + + //Scenario 2 - Request for state change from Normal to shutdown state to any substate + // Cancel the request immediately, so that we can proceed with the next test scenario. + RDebug::Print(_L("\nScenario 2 \n")); + TRequestStatus status_shutdownanysubstate; + TSsmState shutdownState_Any(ESsmShutdown, KSsmAnySubState); + TSsmStateTransition stateTrans_shutdownAnySubState(shutdownState_Any, 1); + + stateMan.RequestStateTransition(stateTrans_shutdownAnySubState, status_shutdownanysubstate); + RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state any substate %d\n "), status_shutdownanysubstate.Int()); - User::WaitForRequest(status2); - iFileWriteStream.WriteInt32L(status2.Int()); - if (status2.Int() == KErrNone) - { - RDebug::Print(_L("\nStateTran Test: Second RequestStateTransition from Normal to fail state %d Expected 0\n "), status2.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Test: Second RequestStateTransition from Normal to fail state Failed")); - User::Leave(KTestAppFailure); - } - - stateMan.RequestStateTransition(stateTrans3, status2); //System is in fail state - RDebug::Print(_L("\nStateTran Test: Start RequestStateTransition from fail to fail state %d\n "), status2.Int()); - - User::WaitForRequest(status2); - iFileWriteStream.WriteInt32L(status2.Int()); - if (status2.Int() == KErrNotSupported) - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from fail to fail state completed with %d Expected -5\n "), status2.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from fail to fail state Failed")); - User::Leave(KTestAppFailure); - } + stateMan.RequestStateTransitionCancel(); + + iFileWriteStream.WriteInt32L(status_shutdownanysubstate.Int()); + if (status_shutdownanysubstate.Int() == KErrCancel) + { + CurrentSystemStateL(); + RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state any substate completed %d Expected -3\n "), status_shutdownanysubstate.Int()); + } + else + User::Leave(KTestAppFailure); + + iFileWriteStream.Close(); + + // Creates and open the result file for streaming + err = iFileWriteStream.Replace(iFs, KGsaTestStateTranToShutdownResult, EFileWrite); + RDebug::Print(_L("\nStateTran Test: iFileWriteStream open with %d\n"), err); + + + // Gets the Current system state before starting the test + CurrentSystemStateL(); + + //Scenario 1 - Request for state transition to shutdown state - invalid substate + // request to transit to the shutdown state will be completed with KErrNotSupported + RDebug::Print(_L("\nScenario 1 \n")); + + TRequestStatus status_invalidsubstate; + TSsmState shutdownState_Invalid(ESsmShutdown, 150); + TSsmStateTransition stateTrans_Invalid(shutdownState_Invalid, 1); + + stateMan.RequestStateTransition(stateTrans_Invalid, status_invalidsubstate); + RDebug::Print(_L("\n Start RequestStateTransition from Normal to shutdown state with invalid substate %d\n "), status_invalidsubstate.Int()); + + User::WaitForRequest(status_invalidsubstate); + iFileWriteStream.WriteInt32L(status_invalidsubstate.Int()); + if (status_invalidsubstate.Int() == KErrNotSupported) + { + CurrentSystemStateL(); + RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state with invalid substate completes with %d Expected -5\n "), status_invalidsubstate.Int()); + } + else + User::Leave(KTestAppFailure); + + iFileWriteStream.Close(); + CleanupStack::PopAndDestroy(&stateMan); } void CStateTranFromNormal::StartTestL() @@ -265,10 +283,6 @@ CleanupStack::PushL(sched); CActiveScheduler::Install(sched); - // Notifier used to get the notification when system gets to fail state - CSsmStateAwareSession* notif_for_failstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); - notif_for_failstate->AddSubscriberL(*this); - // This async callback is used to start the state transition test once system enters to normal state. iAsyncCallbackForStartTest = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); TCallBack startTestCallback(StartTest, this); @@ -280,7 +294,7 @@ RProcess::Rendezvous(KErrNone); sched->Start(); - CleanupStack::PopAndDestroy(2); + CleanupStack::PopAndDestroy(1); } TInt E32Main() diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromshutdown.cpp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromshutdown.cpp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,337 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -/** - @file - @test - @internalComponent - Internal Symbian test code -*/ - -#include "gsatestapps.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "tgsastatetran_base.h" - -class CStateTranFromShutdown : public CTGsaStateTransition - { -public: - static CStateTranFromShutdown* NewL(); - ~CStateTranFromShutdown(); - void StartTestL(); - void CallStopSchedulerL(); - -private: - void ConstructL(); - CStateTranFromShutdown(); - -public: - void DoTestStateTranFromShutdownL(); - }; - -static TInt StopScheduler(TAny* aStateTranFromShutdown) - { - CStateTranFromShutdown* stateTran = reinterpret_cast(aStateTranFromShutdown); - TRAPD(err,stateTran->CallStopSchedulerL()); - return err; - } - -static TInt StartTest(TAny* aStateTranFromShutdown) - { - TInt testCompletionReason = KErrNone; - CStateTranFromShutdown* stateTran = reinterpret_cast(aStateTranFromShutdown); - TBool stateTest = stateTran->DoStartStateTranTest(); - if (stateTest) - { - RDebug::Print(_L("\nStateTran Test: Start the tgsastatetranfromshutdown test\n")); - TRAP(testCompletionReason, stateTran->DoTestStateTranFromShutdownL()); - } - - return testCompletionReason; - } - -CStateTranFromShutdown* CStateTranFromShutdown::NewL() - { - CStateTranFromShutdown* self = new(ELeave) CStateTranFromShutdown(); - self->ConstructL(); - return self; - } - -void CStateTranFromShutdown::ConstructL() - { - CTGsaStateTransition::ConstructL(KGsaTestStateTranResultFilePath); - } - -CStateTranFromShutdown::~CStateTranFromShutdown() - { - } - -CStateTranFromShutdown::CStateTranFromShutdown() - { - } - -// Tests the Shutdown state transitions under different scenarios -void CStateTranFromShutdown::DoTestStateTranFromShutdownL() - { - // This async callback is used to stop the scheduler once the system goes into fail state. - iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack stopSchedulerCallback(StopScheduler, this); - iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); - - // call the callback function which keeps looping until the system state gets into fail state. - iAsyncCallbackForStopScheduler->CallBack(); - - RSsmStateManager stateMan; - TInt err = stateMan.Connect(); - if (err == KErrNone) - RDebug::Print(_L("\nStateTran Test: RSsmStateManager sess Connect %d\n"), err); - else - { - RDebug::Print(_L("\nStateTran Test: Unable to connect to RSsmStateManager sess\n")); - User::Leave(KTestAppFailure); - } - - // Creates and open the result file for streaming - err = iFileWriteStream.Replace(iFs, KGsaTestStateTranFromShutdownResult, EFileWrite); - RDebug::Print(_L("\nStateTran Test: iFileWriteStream open with %d\n"), err); - - - // Gets the Current system state before starting the test - CurrentSystemStateL(); - - //Scenario 1 - Request for state change from Normal to shutdown state to critical substate - // Cancel the request immediately - RDebug::Print(_L("\nScenario 1 \n")); - TRequestStatus status_shutdowncritsubstate; - TSsmState shutdownState_Critical(ESsmShutdown, ESsmShutdownSubStateCritical); - TSsmStateTransition stateTrans_Shutdowncritical(shutdownState_Critical, 1); - - stateMan.RequestStateTransition(stateTrans_Shutdowncritical, status_shutdowncritsubstate); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate %d\n "), status_shutdowncritsubstate.Int()); - - stateMan.RequestStateTransitionCancel(); - - iFileWriteStream.WriteInt32L(status_shutdowncritsubstate.Int()); - if (status_shutdowncritsubstate.Int() == KErrCancel) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate completed %d Expected -3\n "), status_shutdowncritsubstate.Int()); - } - else - User::Leave(KTestAppFailure); - - //Scenario 2 - Request for state change from Normal to shutdown state to any substate - // Cancel the request immediately, so that we can proceed with the next test scenario. - RDebug::Print(_L("\nScenario 2 \n")); - TRequestStatus status_shutdownanysubstate; - TSsmState shutdownState_Any(ESsmShutdown, KSsmAnySubState); - TSsmStateTransition stateTrans_shutdownAnySubState(shutdownState_Any, 1); - - stateMan.RequestStateTransition(stateTrans_shutdownAnySubState, status_shutdownanysubstate); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state any substate %d\n "), status_shutdownanysubstate.Int()); - - stateMan.RequestStateTransitionCancel(); - - iFileWriteStream.WriteInt32L(status_shutdownanysubstate.Int()); - if (status_shutdownanysubstate.Int() == KErrCancel) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state any substate completed %d Expected -3\n "), status_shutdownanysubstate.Int()); - } - else - User::Leave(KTestAppFailure); - - //Scenario 3 - Request for three state changes(1. shutdown state 2. invalid state 3. fail state) one after the other - // i.e., second request is issued once first one is completed and the third one is issued after the second request is completed. - // Cancel the third request. - // first request to the shutdown state will be completed with KErrNone - // second request to transit to the fail state will be completed with KErrNotSupported - // third request to transit to the fail state will be completed with KErrCancel - RDebug::Print(_L("\nScenario 3 \n")); - - TRequestStatus status; - stateMan.RequestStateTransition(stateTrans_Shutdowncritical, status); - RDebug::Print(_L("\n Start First RequestStateTransition from Normal to shutdown state %d\n "), status.Int()); - - User::WaitForRequest(status); - iFileWriteStream.WriteInt32L(status.Int()); - if (status.Int() == KErrNone) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n First RequestStateTransition from Normal to shutdown state completes with %d Expected 0\n "), status.Int()); - } - else - User::Leave(KTestAppFailure); - - TRequestStatus status1; - TSsmState state(10, KSsmAnySubState); - TSsmStateTransition stateTrans_InvalidState(state, 1); - - stateMan.RequestStateTransition(stateTrans_InvalidState, status1); - RDebug::Print(_L("\n Start Second RequestStateTransition from shutdown to invalid state %d\n "), status1.Int()); - - User::WaitForRequest(status1); - - iFileWriteStream.WriteInt32L(status1.Int()); - if (status1.Int() == KErrNotSupported) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n Second RequestStateTransition from shutdown to invalid state completes %d Expected -5\n "), status1.Int()); - } - else - User::Leave(KTestAppFailure); - - TRequestStatus status2; - state.Set(ESsmFail, KSsmAnySubState); - TSsmStateTransition stateTrans3(state, 1); - - stateMan.RequestStateTransition(stateTrans3, status2); - RDebug::Print(_L("\n Start Third RequestStateTransition from Shutdown to fail state %d\n "), status2.Int()); - - stateMan.RequestStateTransitionCancel(); - User::WaitForRequest(status2); - - iFileWriteStream.WriteInt32L(status2.Int()); - if (status2.Int() == KErrCancel) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n Third RequestStateTransitionCancel from Shutdown to fail state completes %d Expected -3\n "), status2.Int()); - } - else - User::Leave(KTestAppFailure); - - //Scenario 4 - The system is now in shutdown state, request for state transition to normal state. - // request to transit to the normal state will be completed with KErrNotSupported - RDebug::Print(_L("\nScenario 4 \n")); - - TSsmState state_Normal(ESsmNormal, KSsmAnySubState); - TSsmStateTransition stateTrans_NormalState(state_Normal, 1); - - stateMan.RequestStateTransition(stateTrans_NormalState, status1); - RDebug::Print(_L("\n RequestStateTransition from Shutdown to normal state %d\n "), status1.Int()); - - User::WaitForRequest(status1); - - iFileWriteStream.WriteInt32L(status1.Int()); - if (status1.Int() == KErrNotSupported) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n RequestStateTransition from Shutdown to normal state completes %d Expected -5\n "), status1.Int()); - } - else - User::Leave(KTestAppFailure); - - //Scenario 5 - The system is now in shutdown state, request for state transition to fail state. - // request to transit to the fail state will be completed with KErrNone - RDebug::Print(_L("\nScenario 5 \n")); - - stateMan.RequestStateTransition(stateTrans3, status1); - RDebug::Print(_L("\n RequestStateTransition from Shutdown to fail state %d\n "), status1.Int()); - - User::WaitForRequest(status1); - - iFileWriteStream.WriteInt32L(status1.Int()); - if (status1.Int() == KErrNone) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n RequestStateTransition from Shutdown to fail state completes %d Expected 0\n "), status1.Int()); - } - else - User::Leave(KTestAppFailure); - } - -void CStateTranFromShutdown::StartTestL() - { - CActiveScheduler* sched=new(ELeave) CActiveScheduler; - CleanupStack::PushL(sched); - CActiveScheduler::Install(sched); - - // Notifier used to get the notification when system gets to fail state - CSsmStateAwareSession* notif_for_failstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); - notif_for_failstate->AddSubscriberL(*this); - - // This async callback is used to start the state transition test once system enters to normal state. - iAsyncCallbackForStartTest = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack startTestCallback(StartTest, this); - iAsyncCallbackForStartTest->Set(startTestCallback); - - // call the callback function which keeps looping until the system state gets into normal state. - iAsyncCallbackForStartTest->CallBack(); - - RProcess::Rendezvous(KErrNone); - sched->Start(); - - CleanupStack::PopAndDestroy(2); - } - -void CStateTranFromShutdown::CallStopSchedulerL() - { - TSsmState currenState; - currenState = iSsmStateAwareSess.State(); - - TUint16 currentMainState = currenState.MainState(); - // Active scheduler is stopped once the system goes into fail state, else it issues a request for callback again - if (currentMainState == ESsmFail) - { - RDebug::Print(_L("\nStateTran Test: Stop Active Scheduler\n")); - iFileWriteStream.WriteUint16L(currentMainState); - CActiveScheduler::Stop(); - } - else - { - iAsyncCallbackForStopScheduler->CallBack(); - } - } - -TInt E32Main() - { - __UHEAP_MARK; - - CTrapCleanup* cleanup=CTrapCleanup::New(); - TInt r=KErrNoMemory; - TInt testCompletionReason = KErrNone; - if (cleanup) - { - __UHEAP_MARK; - CStateTranFromShutdown* stateTran = NULL; - TRAP(r, stateTran = CStateTranFromShutdown::NewL()); - if (r == KErrNone) - { - TRAP(testCompletionReason, stateTran->StartTestL()); - // testCompletionReason is the reason with which the test case completes. - TRAP(r, stateTran->CommitTestResultsL(testCompletionReason)); - delete stateTran; - } - delete cleanup; - __UHEAP_MARKEND; - - if (r != KErrNone) - { - User::Panic(_L("tgsastatetranfromnormalPanic"), r); - } - } - - __UHEAP_MARKEND; - return r; - } - - - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromstartup.cpp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromstartup.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetranfromstartup.cpp Thu Sep 02 21:48:26 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" @@ -43,15 +43,8 @@ public: void DoTestStateTranFromStartupL(); - void DoTestStateTranFromStartuptoShutdownL(); }; -static TInt StopScheduler(TAny* aStateTranFromStartup) - { - CStateTranFromStartup* stateTran = reinterpret_cast(aStateTranFromStartup); - TRAPD(err,stateTran->CallStopSchedulerL()); - return err; - } CStateTranFromStartup* CStateTranFromStartup::NewL() { @@ -73,17 +66,9 @@ { } -// Tests the Fail state transitions from startup under different scenarios +// Tests Invalid state transition from startup void CStateTranFromStartup::DoTestStateTranFromStartupL() { - CActiveScheduler* sched=new(ELeave) CActiveScheduler; - CleanupStack::PushL(sched); - CActiveScheduler::Install(sched); - - // Notifier used to get the notification when system gets to fail state - CSsmStateAwareSession* notif_for_failstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); - notif_for_failstate->AddSubscriberL(*this); - RSsmStateManager stateMan; TInt err = stateMan.Connect(); CleanupClosePushL(stateMan); @@ -114,170 +99,17 @@ if (status.Int() == KErrNotSupported) { CurrentSystemStateL(); - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Normal to Invalid state completes with %d Expected -5\n "), status.Int()); - } - else - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Normal to Invalid state Failed")); - User::Leave(KTestAppFailure); - } - - //Scenario 2 - Request for state change from Startup to fail state with invalid substate - RDebug::Print(_L("\nStateTran Test: Scenario 2 \n")); - const TInt KInvalidFailSubState = 20; - state.Set(ESsmFail, KInvalidFailSubState); - TSsmStateTransition stateTrans_InvalidSubState(state, 1); - - stateMan.RequestStateTransition(stateTrans_InvalidSubState, status); - RDebug::Print(_L("\nStateTran Test: Start RequestStateTransition from Startup to fail state with invalid substate %d\n "), status.Int()); - - User::WaitForRequest(status); - iFileWriteStream.WriteInt32L(status.Int()); - if (status.Int() == KErrNotSupported) - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Startup to fail state with invalid substate completes with %d Expected -5\n "), status.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Startup to fail state with invalid substate Failed")); - User::Leave(KTestAppFailure); - } - - //Scenario 3 - Request for state change from Startup to shutdown invalid substate - RDebug::Print(_L("\nStateTran Test: Scenario 3 \n")); - TRequestStatus status1; - const TInt KInvalidShutdownSubState = 15; - TSsmState shutdownState_Invalid(ESsmShutdown, KInvalidShutdownSubState); - TSsmStateTransition stateTrans_ShutdownInvalid(shutdownState_Invalid, 1); - - stateMan.RequestStateTransition(stateTrans_ShutdownInvalid, status); - RDebug::Print(_L("\nStateTran Test: Start RequestStateTransition from Startup to Shutdown state with Invalid Substate %d\n "), status.Int()); - - User::WaitForRequest(status); - iFileWriteStream.WriteInt32L(status.Int()); - if (status.Int() == KErrNotSupported) - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Startup to Shutdown state with invalid substate completes with %d Expected -5\n "), status.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Startup to fail state with invalid substate Failed")); - User::Leave(KTestAppFailure); - } - - //Scenario 4 - Request for two state changes to fail state one after the other - //The first request to the fail state will be completed with KErrCancel and the second request to transit to the fail state will be completed with KErrNone. - RDebug::Print(_L("\nStateTran Test: Scenario 4 \n")); - state.Set(ESsmFail, KSsmAnySubState); - TSsmStateTransition stateTrans_fail(state, 1); - - stateMan.RequestStateTransition(stateTrans_fail, status); - RDebug::Print(_L("\nStateTran Test: Start First RequestStateTransition from Startup to fail state %d\n "), status.Int()); - - stateMan.RequestStateTransition(stateTrans_fail, status1); - RDebug::Print(_L("\nStateTran Test: Start Second RequestStateTransition from Startup to fail state %d\n "), status1.Int()); - - User::WaitForRequest(status); - iFileWriteStream.WriteInt32L(status.Int()); - if (status.Int() == KErrCancel) - { - RDebug::Print(_L("\nStateTran Test: First RequestStateTransition from Startup to fail state completes with %d Expected -3\n "), status.Int()); - CurrentSystemStateL(); + RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Startup to Invalid state completes with %d Expected -5\n "), status.Int()); } else { - RDebug::Print(_L("\nStateTran Test: First RequestStateTransition from Startup to fail state Failed")); - User::Leave(KTestAppFailure); - } - - User::WaitForRequest(status1); - iFileWriteStream.WriteInt32L(status1.Int()); - if (status1.Int() == KErrNone) - { - RDebug::Print(_L("\nStateTran Test: Second RequestStateTransition from Startup to fail state completes %d Expected 0\n "), status1.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Test: Second RequestStateTransition from Startup to fail state Failed")); - User::Leave(KTestAppFailure); - } - - // This async callback is used to stop the scheduler once the system goes into fail state. - iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack stopSchedulerCallback(StopScheduler, this); - iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); - - iAsyncCallbackForStopScheduler->CallBack(); - sched->Start(); - - CleanupStack::PopAndDestroy(3); - } - -// Tests the Shutdown state transitions from startup scenario -void CStateTranFromStartup::DoTestStateTranFromStartuptoShutdownL() - { - RDebug::Printf("I am in CStateTranFromStartup::DoTestStateTranFromStartupShutdownL"); - CActiveScheduler* sched=new(ELeave) CActiveScheduler; - CleanupStack::PushL(sched); - CActiveScheduler::Install(sched); - - // Notifier used to get the notification when system gets to Shutdown state - CSsmStateAwareSession* notif_for_shutdownstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); - notif_for_shutdownstate->AddSubscriberL(*this); - - RSsmStateManager stateMan; - TRequestStatus status; - TInt err = stateMan.Connect(); - CleanupClosePushL(stateMan); - if (err == KErrNone) - RDebug::Print(_L("\nStateTran Shutdown Test: RSsmStateManager sess Connect %d\n"), err); - else - { - RDebug::Print(_L("\nStateTran Shutdown Test: Unable to connect to RSsmStateManager sess\n")); + RDebug::Print(_L("\nStateTran Test: RequestStateTransition from Startup to Invalid state Failed")); User::Leave(KTestAppFailure); } - // Creates and open the result file for streaming - err = iFileWriteStream.Replace(iFs, KGsaTestStateTranFromStartupResult, EFileWrite); - RDebug::Print(_L("\nStateTran Shutdown Test: iFileWriteStream open with %d\n"), err); - - CurrentSystemStateL(); - - RDebug::Print(_L("\nStateTran Shutdown Test Scenario \n")); - TSsmState shutdownState_Critical(ESsmShutdown, ESsmShutdownSubStateCritical); - TSsmStateTransition stateTrans_ShutdownCritical(shutdownState_Critical, 1); + CleanupStack::PopAndDestroy(&stateMan); + } - stateMan.RequestStateTransition(stateTrans_ShutdownCritical, status); - RDebug::Print(_L("\nStateTran Shutdown Test: Start RequestStateTransition from Startup to shutdown state %d\n "), status.Int()); - - User::WaitForRequest(status); - iFileWriteStream.WriteInt32L(status.Int()); - RDebug::Printf("The value of status is %d",status.Int()); - if (status.Int() == KErrNone) - { - RDebug::Print(_L("\nStateTran Shutdown Test: RequestStateTransition from Startup to Shutdown state completes with %d Expected 0\n "), status.Int()); - CurrentSystemStateL(); - } - else - { - RDebug::Print(_L("\nStateTran Shutdown Test: RequestStateTransition from Startup to Shutdown state Failed")); - User::Leave(KTestAppFailure); - } - - // This async callback is used to stop the scheduler once the system goes into Shutdown state. - iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack stopSchedulerCallback(StopScheduler, this); - iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); - - iAsyncCallbackForStopScheduler->CallBack(); - sched->Start(); - - CleanupStack::PopAndDestroy(3); - - } TInt E32Main() { @@ -294,14 +126,7 @@ TRAP(r, stateTran = CStateTranFromStartup::NewL()); if (r == KErrNone) { - if(argc>0) - { - TRAP(testCompletionReason, stateTran->DoTestStateTranFromStartuptoShutdownL()); - } - else - { - TRAP(testCompletionReason, stateTran->DoTestStateTranFromStartupL()); - } + TRAP(testCompletionReason, stateTran->DoTestStateTranFromStartupL()); // testCompletionReason is the reason with which the test case completes. TRAP(r, stateTran->CommitTestResultsL(testCompletionReason)); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetrantoshutdown.cpp --- a/sysstatemgmt/systemstateplugins/test/tintgsapolicy/src/tgsastatetrantoshutdown.cpp Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -// Copyright (c) 2008-2009 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: -// - -/** - @file - @test - @internalComponent - Internal Symbian test code -*/ - -#include "gsatestapps.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "tgsastatetran_base.h" - -class CStateTranToShutdown : public CTGsaStateTransition - { -public: - static CStateTranToShutdown* NewL(); - ~CStateTranToShutdown(); - void StartTestL(); - -private: - void ConstructL(); - CStateTranToShutdown(); - -public: - void DoTestStateTranToShutdownL(); - }; - -static TInt StopScheduler(TAny* aStateTranToShutdown) - { - CStateTranToShutdown* stateTran = reinterpret_cast(aStateTranToShutdown); - TRAPD(err,stateTran->CallStopSchedulerL()); - return err; - } - -static TInt StartTest(TAny* aStateTranToShutdown) - { - TInt testCompletionReason = KErrNone; - CStateTranToShutdown* stateTran = reinterpret_cast(aStateTranToShutdown); - TBool stateTest = stateTran->DoStartStateTranTest(); - if (stateTest) - TRAP(testCompletionReason, stateTran->DoTestStateTranToShutdownL()); - - return testCompletionReason; - } - -CStateTranToShutdown* CStateTranToShutdown::NewL() - { - CStateTranToShutdown* self = new(ELeave) CStateTranToShutdown(); - self->ConstructL(); - return self; - } - -void CStateTranToShutdown::ConstructL() - { - CTGsaStateTransition::ConstructL(KGsaTestStateTranResultFilePath); - } - -CStateTranToShutdown::~CStateTranToShutdown() - { - } - -CStateTranToShutdown::CStateTranToShutdown() - { - } - -// Tests the Shutdown state transitions under different scenarios -void CStateTranToShutdown::DoTestStateTranToShutdownL() - { - // This async callback is used to stop the scheduler once the system goes into fail state. - iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack stopSchedulerCallback(StopScheduler, this); - iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); - - // call the callback function which keeps looping until the system state gets into fail state. - iAsyncCallbackForStopScheduler->CallBack(); - - RSsmStateManager stateMan; - TInt err = stateMan.Connect(); - if (err == KErrNone) - RDebug::Print(_L("\nStateTran Test: RSsmStateManager sess Connect %d\n"), err); - else - { - RDebug::Print(_L("\nStateTran Test: Unable to connect to RSsmStateManager sess\n")); - User::Leave(KTestAppFailure); - } - - // Creates and open the result file for streaming - err = iFileWriteStream.Replace(iFs, KGsaTestStateTranToShutdownResult, EFileWrite); - RDebug::Print(_L("\nStateTran Test: iFileWriteStream open with %d\n"), err); - - - // Gets the Current system state before starting the test - CurrentSystemStateL(); - - //Scenario 1 - Request for state transition to shutdown state - invalid substate - // request to transit to the shutdown state will be completed with KErrNotSupported - RDebug::Print(_L("\nScenario 1 \n")); - - TRequestStatus status_invalidsubstate; - TSsmState shutdownState_Invalid(ESsmShutdown, 150); - TSsmStateTransition stateTrans_Invalid(shutdownState_Invalid, 1); - - stateMan.RequestStateTransition(stateTrans_Invalid, status_invalidsubstate); - RDebug::Print(_L("\n Start RequestStateTransition from Normal to shutdown state with invalid substate %d\n "), status_invalidsubstate.Int()); - - User::WaitForRequest(status_invalidsubstate); - iFileWriteStream.WriteInt32L(status_invalidsubstate.Int()); - if (status_invalidsubstate.Int() == KErrNotSupported) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state with invalid substate completes with %d Expected -5\n "), status_invalidsubstate.Int()); - } - else - User::Leave(KTestAppFailure); - - //Scenario 2 - Request for state transition to shutdown state - critical substate(Restart) - // Request for state transition to shutdown state - critical substate(Standby) - // first request to transit to the shutdown state critical substate(Restart)will be completed with KErrCancel - // second request to transit to the shutdown state critical substate(Standby)will be completed with KErrNone - RDebug::Print(_L("\nScenario 2 \n")); - TRequestStatus status_shutdowncritsubstate; - TSsmState shutdownState_Critical(ESsmShutdown, ESsmShutdownSubStateCritical); - TSsmStateTransition stateTrans_Shutdowncritical_Restart(shutdownState_Critical, 3); - - stateMan.RequestStateTransition(stateTrans_Shutdowncritical_Restart, status_shutdowncritsubstate); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate Restart%d\n "), status_shutdowncritsubstate.Int()); - - TRequestStatus status_shutdowncritsubstate1; - TSsmStateTransition stateTrans_Shutdowncritical_Standby(shutdownState_Critical, 1); - - stateMan.RequestStateTransition(stateTrans_Shutdowncritical_Standby, status_shutdowncritsubstate1); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate Standby %d\n "), status_shutdowncritsubstate.Int()); - - User::WaitForRequest(status_shutdowncritsubstate1); - iFileWriteStream.WriteInt32L(status_shutdowncritsubstate1.Int()); - if (status_shutdowncritsubstate1.Int() == KErrNone) - { - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate completed Standby %d Expected 0\n "), status_shutdowncritsubstate1.Int()); - CurrentSystemStateL(); - } - else - User::Leave(KTestAppFailure); - - User::WaitForRequest(status_shutdowncritsubstate); - iFileWriteStream.WriteInt32L(status_shutdowncritsubstate.Int()); - if (status_shutdowncritsubstate.Int() == KErrCancel) - { - CurrentSystemStateL(); - RDebug::Print(_L("\n RequestStateTransition from Normal to shutdown state critical substate completed Restart %d Expected -3\n "), status_shutdowncritsubstate.Int()); - } - else - User::Leave(KTestAppFailure); - - } - -void CStateTranToShutdown::StartTestL() - { - CActiveScheduler* sched=new(ELeave) CActiveScheduler; - CleanupStack::PushL(sched); - CActiveScheduler::Install(sched); - - // Notifier used to get the notification when system gets to fail state - CSsmStateAwareSession* notif_for_failstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); - notif_for_failstate->AddSubscriberL(*this); - - // This async callback is used to start the state transition test once system enters to normal state. - iAsyncCallbackForStartTest = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); - TCallBack startTestCallback(StartTest, this); - iAsyncCallbackForStartTest->Set(startTestCallback); - - // call the callback function which keeps looping until the system state gets into normal state. - iAsyncCallbackForStartTest->CallBack(); - - RProcess::Rendezvous(KErrNone); - sched->Start(); - - CleanupStack::PopAndDestroy(2); - } - -TInt E32Main() - { - __UHEAP_MARK; - - CTrapCleanup* cleanup=CTrapCleanup::New(); - TInt r=KErrNoMemory; - TInt testCompletionReason = KErrNone; - if (cleanup) - { - __UHEAP_MARK; - CStateTranToShutdown* stateTran = NULL; - TRAP(r, stateTran = CStateTranToShutdown::NewL()); - if (r == KErrNone) - { - TRAP(testCompletionReason, stateTran->StartTestL()); - // testCompletionReason is the reason with which the test case completes. - TRAP(r, stateTran->CommitTestResultsL(testCompletionReason)); - delete stateTran; - } - delete cleanup; - __UHEAP_MARKEND; - - if (r != KErrNone) - { - User::Panic(_L("tgsastatetrantoshutdownpanic"), r); - } - } - - __UHEAP_MARKEND; - return r; - } - - - diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterdomaincrkeys.h --- a/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterdomaincrkeys.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/clayer/inc/starterdomaincrkeys.h Thu Sep 02 21:48:26 2010 +0300 @@ -54,6 +54,16 @@ EStartupNotFirstBoot }; +/** +* Used by Starter to store the device lock status +*/ +const TUint32 KStartupDevLockStatus = 0x00000004; +enum TStartupDevLockSuccess + { + EStartupDevLockNotSucess = 100, + EStartupDevLockSucess + }; + #endif // STARTERDOMAINCRKEYS_H // End of File diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmddevicesecuritycheck.h --- a/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmddevicesecuritycheck.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/inc/cmddevicesecuritycheck.h Thu Sep 02 21:48:26 2010 +0300 @@ -33,6 +33,8 @@ #include #include +class CRepository; + NONSHARABLE_CLASS (CCustomCmdDeviceSecurityCheck) : public CActive , public MSsmCustomCommand { public: @@ -94,6 +96,7 @@ HBufC* iTsyModuleName; TRequestStatus* iExecuteRequest; CSsmSecurityCheckNotifier* iSsmSecurityCheckNotifier; + CRepository* iStartupRepository; #ifdef TEST_CUSTCMD_MACRO friend class CCustomCmdTestDeviceSecurityCheck; diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp --- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -28,6 +28,11 @@ #include "ssmuiproviderdll.h" #include "ssmrefcustomcmdcommon.h" #include "ssmdebug.h" +#include "starterdomaincrkeys.h" +#include "startupdomainpskeys.h" + +#include + CCustomCmdDeviceSecurityCheck* CCustomCmdDeviceSecurityCheck::NewL() { @@ -69,6 +74,8 @@ User::Leave(errorCode); } + iStartupRepository = CRepository::NewL(KCRUidStartup); + //Add active object to active scheduler CActiveScheduler::Add(this); } @@ -92,6 +99,7 @@ iServer.Close(); } delete iTsyModuleName; + delete iStartupRepository; } TInt CCustomCmdDeviceSecurityCheck::Initialize(CSsmCustomCommandEnv* /*aCmdEnv*/) @@ -113,7 +121,8 @@ //Set the user request to pending aStatus = KRequestPending; iExecuteRequest = &aStatus; - + + TInt errorCode = KErrNone; #ifdef __WINS__ #ifdef TEST_CUSTCMD_MACRO TRequestStatus* status = &iStatus; @@ -122,19 +131,35 @@ #else // The device lock status can not be read in the emulator. // Just pretend the lock is not enabled. - TInt errorCode = RProperty::Set(CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, EStarterSecurityPhaseSimOk); + errorCode = RProperty::Set(CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, EStarterSecurityPhaseSimOk); CompleteClientRequest(errorCode); #endif //TEST_CUSTCMD_MACRO #else - if (CSsmUiSpecific::IsNormalBoot() || CSsmUiSpecific::IsSimChangedReset()) + + TInt val(EStartupDevLockNotSucess); + + errorCode = iStartupRepository->Get(KStartupDevLockStatus, val); + DEBUGPRINT3A("Getting KStartupDevLockStatus : %d completed with %d", val, errorCode); + + TInt startupReason = 0; + if (EStartupDevLockNotSucess != val) + { + errorCode = iStartupRepository->Set(KStartupDevLockStatus, EStartupDevLockNotSucess); + DEBUGPRINT2A("Setting KStartupDevLockStatus to EStartupDevLockNotSucess completed with %d", errorCode); + } + + errorCode = RProperty::Get(CSsmUiSpecific::StartupPSUid(), KPSStartupReason, startupReason); + DEBUGPRINT3A("Getting KPSStartupReason : %d completed with : %d", startupReason, errorCode); + + if (CSsmUiSpecific::IsNormalBoot() || CSsmUiSpecific::IsSimChangedReset() || (EStartupDevLockNotSucess == val && EUnknownReset == startupReason)) { iPhone.GetLockInfo( iStatus, RMobilePhone::ELockPhoneDevice, iLockInfoPckg ); SetActive(); } else { - TInt errorCode = RProperty::Set( + errorCode = RProperty::Set( CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, EStarterSecurityPhaseSecOk ); CompleteClientRequest( errorCode ); } @@ -285,10 +310,14 @@ void CCustomCmdDeviceSecurityCheck::CompleteClientRequest(TInt aReason) { + DEBUGPRINT2A("Device Security Check completed with %d", aReason); + + TInt err = iStartupRepository->Set(KStartupDevLockStatus, (aReason == KErrNone ? EStartupDevLockSucess : EStartupDevLockNotSucess)); + DEBUGPRINT2A("Setting KStartupDevLockStatus completed with error %d", err); //Complete client request with reason code if (iExecuteRequest) { - TInt errorCode = RProperty::Set(CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, + err = RProperty::Set(CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, aReason == KErrNone ? EStarterSecurityPhaseSecOk : EStarterSecurityPhaseSecNok ); User::RequestComplete(iExecuteRequest, aReason); } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdpublishstartupmode.cpp --- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdpublishstartupmode.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdpublishstartupmode.cpp Thu Sep 02 21:48:26 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" @@ -150,6 +150,12 @@ DEBUGPRINT1A("Hidden reset detected"); startupReason = EUnknownReset; } + else + { + err = iRepository->Set(KStartupDevLockStatus, EStartupDevLockNotSucess); + DEBUGPRINT1A("Normal Device Startup"); + DEBUGPRINT2A("Setting KStartupDevLockStatus to EStartupDevLockNotSucess completed with error %d", err); + } // Publish startup reason err = RProperty::Set(CSsmUiSpecific::StartupPSUid(), KPSStartupReason, startupReason); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdsimsecuritycheck.cpp --- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdsimsecuritycheck.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmdsimsecuritycheck.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -155,6 +155,8 @@ __ASSERT_ALWAYS(!IsActive(), PanicNow(KPanicCustomCmdSimSecurityCheck, EInternalStateError)); __ASSERT_ALWAYS(!iStateChangePending, PanicNow(KPanicCustomCmdSimSecurityCheck, EInternalStateError)); + DEBUGPRINT2A("CCustomCmdSimSecurityCheck StartStateChange with State - %d ", aState); + iSubState = ESecuritySubStateNone; iStateChangePending = ETrue; iNoteType = aNoteType; @@ -262,6 +264,8 @@ TInt errorCode = KErrNone; //Handle the state transition + + DEBUGPRINT2A("CCustomCmdSimSecurityCheck SecurityCheckL with State - %d ", iState); switch (iState) { case StartupAdaptation::ESIMPresent: @@ -332,6 +336,7 @@ void CCustomCmdSimSecurityCheck::DoSecurityCheck() { + DEBUGPRINT2A("CCustomCmdSimSecurityCheck DoSecurityCheck with State - %d ", iState); //Handle pending state transition switch (iState) { diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tclayer/src/tclayer_step_startersessionwithssm.cpp --- a/sysstatemgmt/systemstatereferenceplugins/test/tclayer/src/tclayer_step_startersessionwithssm.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tclayer/src/tclayer_step_startersessionwithssm.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -34,6 +34,7 @@ const TUint KRFStatusPropertyKey = 0x2001D2A9; const TUid KRFStatusPropertyCategory = {0x2000D75B}; +const TUint32 KMiscPluginPropertyKey = 0x2000E658; _LIT(KPolicyFilename, "rfstatusswppolicy.dll"); @@ -89,6 +90,18 @@ { __UHEAP_MARK; + TInt error = RProperty::Define(KRFStatusPropertyCategory, KMiscPluginPropertyKey, RProperty::EInt); + if((KErrNone != error) && (KErrAlreadyExists != error)) + { + ERR_PRINTF2(_L("Defining KMiscPluginPropertyKey failed with error %d"), error); + User::Leave(error); + } + error = RProperty::Set(KRFStatusPropertyCategory, KMiscPluginPropertyKey, 1); + if(KErrNone != error) + { + ERR_PRINTF2(_L("Setting KMiscPluginPropertyKey with value 1 failed with error %d"), error); + User::Leave(error); + } TBool ret = ETrue; // Print out the parameters for debugging INFO_PRINTF2( _L("aCommand = %S"), &aCommand ); @@ -99,7 +112,12 @@ SetError(err); ret = EFalse; } - + error = RProperty::Delete(KRFStatusPropertyCategory, KMiscPluginPropertyKey); + if(KErrNone != error) + { + ERR_PRINTF2(_L("Deleting KMiscPluginPropertyKey failed with error %d"), error); + User::Leave(error); + } __UHEAP_MARKEND; return ret; } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/group/definesecuritystateps.mmp --- a/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/group/definesecuritystateps.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/group/definesecuritystateps.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -32,7 +32,7 @@ OS_LAYER_SYSTEMINCLUDE_SYMBIAN MW_LAYER_SYSTEMINCLUDE_SYMBIAN - +MW_LAYER_SYSTEMINCLUDE // Registration file SOURCEPATH ../src diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/inc/tcustcmd_const.h --- a/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/inc/tcustcmd_const.h Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/inc/tcustcmd_const.h Thu Sep 02 21:48:26 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" @@ -79,5 +79,6 @@ }; _LIT(KTestSwpPolicyCustomCmd, "ssm.swp.policy.test.customcmd.dll"); +const TUint32 KEmergencyCallRfAdaptationPluginPropertyKey = 0x2000E657; #endif // __TCUSTCMD_CONST_H__ diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/definesecuritystateps.cpp --- a/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/definesecuritystateps.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/definesecuritystateps.cpp Thu Sep 02 21:48:26 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" @@ -141,7 +141,7 @@ { User::Leave(result); } - + RProcess::Rendezvous(KErrNone); // Complete the UI framework's construction of the App UI. BaseConstructL(CEikAppUi::ENoAppResourceFile); } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_activateemergencycall.cpp --- a/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_activateemergencycall.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_activateemergencycall.cpp Thu Sep 02 21:48:26 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" @@ -14,6 +14,7 @@ // #include "tcustcmd_step_activateemergencycall.h" +#include "tcustcmd_const.h" CCustomCmdTestActivateEmergencyCall::~CCustomCmdTestActivateEmergencyCall() { @@ -44,10 +45,23 @@ INFO_PRINTF1(_L("doTestStepL")); TInt err = 0; __UHEAP_MARK; + + err = RProperty::Define(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, RProperty::EInt); + TEST(KErrNone == err || KErrAlreadyExists == err); + INFO_PRINTF2(_L("RProperty::Define(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, RProperty::EInt); returns %d"), err); + err = RProperty::Set(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, 1); + TEST(KErrNone == err); + INFO_PRINTF2(_L("RProperty::Set(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, 1); returns %d"), err); + TRAP(err,TestHandleActivateEmergencyCallL()); TEST(KErrNone == err); TRAP(err,TestHandleActivateEmergencyCallCancelL()); TEST(KErrNone == err); + + err = RProperty::Delete(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey); + TEST(KErrNone == err); + INFO_PRINTF2(_L("RProperty::Delete(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey); returns %d"), err); + __UHEAP_MARKEND; return TestStepResult(); } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_deactivateemergencycall.cpp --- a/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_deactivateemergencycall.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_deactivateemergencycall.cpp Thu Sep 02 21:48:26 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" @@ -14,6 +14,7 @@ // #include "tcustcmd_step_deactivateemergencycall.h" +#include "tcustcmd_const.h" CCustomCmdTestDeActivateEmergencyCall::~CCustomCmdTestDeActivateEmergencyCall() @@ -45,10 +46,20 @@ INFO_PRINTF1(_L("doTestStepL")); TInt err = 0; __UHEAP_MARK; + + TInt res = RProperty::Define(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, RProperty::EInt); + INFO_PRINTF2(_L("RProperty::Define(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, RProperty::EInt); returns %d"), res); + res = RProperty::Set(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, 1); + INFO_PRINTF2(_L("RProperty::Set(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey, 1); returns %d"), res); + TRAP(err,TestHandleDeActivateEmergencyCallL()); TEST(KErrNone == err); TRAP(err,TestHandleDeActivateEmergencyCallCancelL()); TEST(KErrNone == err); + + res = RProperty::Delete(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey); + INFO_PRINTF2(_L("RProperty::Delete(KPropertyCategory, KEmergencyCallRfAdaptationPluginPropertyKey); returns %d"), res); + return TestStepResult(); } diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_devicesecuritypincheck.cpp --- a/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_devicesecuritypincheck.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tintcustcmd/src/tcustcmd_step_devicesecuritypincheck.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -84,6 +84,23 @@ iAsyncStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); + //Start the test exe which defines startup related property keys + RProcess processHandle; + + TInt temp = processHandle.Create(KExeToDefineStartUpPS, KNullDesC); + TRequestStatus status1; + processHandle.Rendezvous(status1); + processHandle.Resume(); + User::WaitForRequest(status1); + processHandle.Close(); + + processHandle.Create(KExeToDefineStartUpStatePS, KNullDesC); + TRequestStatus status2; + processHandle.Rendezvous(status2); + processHandle.Resume(); + User::WaitForRequest(status2); + processHandle.Close(); + //For stopping the key simulation iStopSimulatekey = CStopSimulateDevicekey::NewL(this); diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tunitcustcmd/group/definestartupps.mmp --- a/sysstatemgmt/systemstatereferenceplugins/test/tunitcustcmd/group/definestartupps.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tunitcustcmd/group/definestartupps.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -29,7 +29,9 @@ USERINCLUDE ../../../clayer/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +MW_LAYER_SYSTEMINCLUDE + // Registration file SOURCEPATH ../src diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/systemstatereferenceplugins/test/tunitcustcmd/group/testpinnotifierplugin.mmp --- a/sysstatemgmt/systemstatereferenceplugins/test/tunitcustcmd/group/testpinnotifierplugin.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/test/tunitcustcmd/group/testpinnotifierplugin.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -35,6 +35,7 @@ OS_LAYER_SYSTEMINCLUDE_SYMBIAN MW_LAYER_SYSTEMINCLUDE_SYMBIAN +MW_LAYER_SYSTEMINCLUDE #ifndef SYMBIAN_OLD_EXPORT_LOCATION SYSTEMINCLUDE /epoc32/include/platform/app #endif diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/tsrc/public/basic/group/MT_SysLangUtil.mmp --- a/sysstatemgmt/tsrc/public/basic/group/MT_SysLangUtil.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/tsrc/public/basic/group/MT_SysLangUtil.mmp Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 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" @@ -32,7 +32,6 @@ USERINCLUDE ../MT_SysLangUtil OS_LAYER_SYSTEMINCLUDE -SYSTEMINCLUDE /epoc32/include/Digia/EUnit LIBRARY EUnit.lib LIBRARY EUnitUtil.lib diff -r 072a9626b290 -r 09d657f1ee00 sysstatemgmt/tsrc/public/basic/mt_rstartersession/MT_RStarterSession_DllMain.cpp --- a/sysstatemgmt/tsrc/public/basic/mt_rstartersession/MT_RStarterSession_DllMain.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/tsrc/public/basic/mt_rstartersession/MT_RStarterSession_DllMain.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -20,7 +20,7 @@ #include "MT_RStarterSession.h" // EXTERNAL INCLUDES -#include +#include EXPORT_C MEUnitTest* CreateTestSuiteL() { diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/sysmonsrc/monitor.cpp --- a/systemhealthmanagement/systemhealthmgr/sysmonsrc/monitor.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/sysmonsrc/monitor.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -27,6 +27,10 @@ #include "shmapanic.h" #include +#ifdef _DEBUG +#include +#endif // _DEBUG + const TInt CMonitor::iOffset = _FOFF(CMonitor, iSglQueLink); const TInt KDelayRequiredForRestartSys = 5000000; // required by RestartSys API, see comments in RestartSys::RestartSystem() @@ -145,7 +149,7 @@ #ifdef _DEBUG TPtrC fileName = iStartupProperties->FileName(); #endif - DEBUGPRINT3(_L("SysMonMonitor: Going to restart %S, old process id=%u"), &fileName, iProcessId.Id()); + DEBUGPRINT3(_L("SysMonMonitor: Going to restart %S, old process id=%u"), &fileName, iProcessId.Id()); CStartSafe* startSafe = CStartSafe::NewL(); CleanupStack::PushL(startSafe); @@ -178,6 +182,20 @@ CleanupStack::PopAndDestroy(startSafe); DEBUGPRINT3(_L("SysMonMonitor: %S restarted, new iProcessId=%u. Logon to monitor again"), &fileName, iProcess.Id().Id()); +#ifdef _DEBUG + TInt restartExeCount = 0; + // The argument passed to the process is converted into an integer and is used as the key to set the RProperty. + // This way each process' restart count is stored in a unique key. + TPtrC processArgs = iStartupProperties->Args(); + TLex processArgsToInt(processArgs); + err = processArgsToInt.Val(restartExeCount); + if( KErrNone == err ) + { + err = RProperty::Set(RProcess().SecureId(), restartExeCount, ++iRestartCount); + DEBUGPRINT4(_L("SysMonMonitor: Setting Test Property with key %d to %d completed with error %d"), restartExeCount, iRestartCount, err); + } +#endif // _DEBUG + iProcessId = iProcess.Id(); iReLaunchAttempts++; // Increment after each re-launch attempt. if (!iReLaunchIntervalTimer->IsActive()) diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/sysmonsrc/monitor.h --- a/systemhealthmanagement/systemhealthmgr/sysmonsrc/monitor.h Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/sysmonsrc/monitor.h Thu Sep 02 21:48:26 2010 +0300 @@ -1,4 +1,4 @@ -// 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" @@ -105,6 +105,9 @@ RLibrary iRestartSysLib; TBool iRestartSysLoaded; #endif //SYMBIAN_SSM_GRACEFUL_SHUTDOWN +#ifdef _DEBUG + TInt iRestartCount; +#endif }; #endif diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/data/tsysmon.ini --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/data/tsysmon.ini Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/data/tsysmon.ini Thu Sep 02 21:48:26 2010 +0300 @@ -114,14 +114,16 @@ [APPFWK-SYSMON-0033] Filename=tsysmon_app_donothing.exe ExpectedRunCount=1 -ExpectedRegisterCount=1 +ExpectedRegisterCount=0 ExpectedRestartCount=0 +ProcessArguments=33 [APPFWK-SYSMON-0034] Filename=tsysmon_app_dontrendezvous.exe ExpectedRunCount=2 -ExpectedRegisterCount=1 +ExpectedRegisterCount=0 ExpectedRestartCount=0 +ProcessArguments=34 [APPFWK-SYSMON-0035] Filename=tsysmon_app_dontrendezvous.exe @@ -140,10 +142,11 @@ ExpectedRegisterCount=1 ExpectedRestartCount=0 -[APPFWK-SYSMON-0038] +[38] ExpectedResult=1 -ExpectedRegisterCount=1 +ExpectedRegisterCount=2 ExpectedRestartCount=0 +ProcessArguments=38 [APPFWK-SYSMON-0039] ExpectedResult=-6 @@ -166,16 +169,18 @@ ExpectedRegisterCount=1 ExpectedRestartCount=1 -[APPFWK-SYSMON-0043] +[43] ExpectedResult=0 -ExpectedRegisterCount=1 +ExpectedRegisterCount=0 ExpectedRestartCount=0 +ProcessArguments=43 [APPFWK-SYSMON-0044] Filename=tsysmon_app_startupregeioffailstart1.exe ExpectedRunCount=1 ExpectedRegisterCount=0 ExpectedRestartCount=0 +ProcessArguments=44 [APPFWK-SYSMON-0045] Filename=tsysmon_app_startupregerosfaillater.exe diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/eabi/sysmontesthelperu.def --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/eabi/sysmontesthelperu.def Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/eabi/sysmontesthelperu.def Thu Sep 02 21:48:26 2010 +0300 @@ -5,7 +5,7 @@ _ZN17CSysMonTestHelper14GetTimeoutArgLERi @ 4 NONAME _ZN17CSysMonTestHelper14TestErrorcodeLERi @ 5 NONAME _ZN17CSysMonTestHelper16GetRestartCountLEv @ 6 NONAME - _ZN17CSysMonTestHelper17GetRegisterCountLEv @ 7 NONAME + _ZN17CSysMonTestHelper16GetRegisterCountEi @ 7 NONAME _ZN17CSysMonTestHelper17WriteDeregResultLERKi @ 8 NONAME _ZN17CSysMonTestHelper18GetDeregResultIntLERK7TDesC16Ri @ 9 NONAME _ZN17CSysMonTestHelper18IncrementRunCountLERK7TDesC16 @ 10 NONAME diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/bld.inf --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/bld.inf Thu Sep 02 21:48:26 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" @@ -62,6 +62,8 @@ PRJ_TESTEXPORTS ../group/shmatest_sysmon.iby /epoc32/rom/include/shmatest_sysmon.iby ../group/sysmontest.iby /epoc32/rom/include/sysmontest.iby +../group/sysmon_iof_tests.iby /epoc32/rom/include/sysmon_iof_tests.iby +../group/sysmon_osrestart_tests.iby /epoc32/rom/include/sysmon_osrestart_tests.iby // Shma batch files for hardware test execution ../scripts/hardware/shmatest_sysmon_run.bat /epoc32/data/z/shmatest/shmatest_sysmon_run.bat @@ -138,3 +140,5 @@ ../scripts/shmatest_sysmon_regselfecnorcapsok.script z:/shmatest/shmatest_sysmon_regselfecnorcapsok.script ../scripts/shmatest_sysmon_regselfecnorcapsnops.script z:/shmatest/shmatest_sysmon_regselfecnorcapsnops.script ../scripts/shmatest_sysmon_failecnorcount1fail.script z:/shmatest/shmatest_sysmon_failecnorcount1fail.script +../scripts/shmatest_sysmon_restartos.script z:/shmatest/shmatest_sysmon_restartos.script +../scripts/shmatest_sysmon_criticalnoretries.script z:/shmatest/shmatest_sysmon_criticalnoretries.script diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmon_iof_tests.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmon_iof_tests.iby Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,40 @@ +// Copyright (c) 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: This iby exports binaries and scripts for tests that require some executables to be started during boot-up with EIgnoreOnFailure policy +// + +#ifndef __SYSMON_IOF_TESTS_IBY__ +#define __SYSMON_IOF_TESTS_IBY__ +data=DATAZ_\private\2000D75B\startup\test\appfwk-sysmon-eiof_hardware0.rsc \private\2000D75B\startup\0\appfwk-sysmon-eiof_hardware0.rsc + +data=ABI_DIR\BUILD_DIR\tsysmon_server.exe \sys\bin\tsysmon_server.exe +file=ABI_DIR\BUILD_DIR\sysmontesthelper.dll \sys\bin\sysmontesthelper.dll + +data=ABI_DIR\BUILD_DIR\tsysmon_app_faileiofcount0.exe \sys\bin\tsysmon_app_faileiofcount0.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_faileiofcount1fail.exe \sys\bin\tsysmon_app_faileiofcount1fail.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_failcount2failwait.exe \sys\bin\tsysmon_app_failcount2failwait.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_failcount2failwait_slave.exe \sys\bin\tsysmon_app_failcount2failwait_slave.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregeiof.exe \sys\bin\tsysmon_app_startupregeiof.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregeioffailstart1.exe \sys\bin\tsysmon_app_startupregeioffailstart1.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_donothing.exe \sys\bin\tsysmon_app_donothing.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_dontrendezvous.exe \sys\bin\tsysmon_app_dontrendezvous.exe + +data=DATAZ_\shmatest\configs\tsysmon.ini \shmatest\configs\tsysmon.ini + +data=DATAZ_\shmatest\shmatest_sysmon_failcount2failwait.script \shmatest\shmatest_sysmon_failcount2failwait.script +data=DATAZ_\shmatest\shmatest_sysmon_faileiofcount0.script \shmatest\shmatest_sysmon_faileiofcount0.script +data=DATAZ_\shmatest\shmatest_sysmon_faileiofcount1fail.script \shmatest\shmatest_sysmon_faileiofcount1fail.script +data=DATAZ_\shmatest\shmatest_sysmon_startupregeiof.script \shmatest\shmatest_sysmon_startupregeiof.script +data=DATAZ_\shmatest\shmatest_sysmon_startupregeioffailstart1.script \shmatest\shmatest_sysmon_startupregeioffailstart1.script + +#endif //__SYSMON_IOF_TESTS_IBY__ \ No newline at end of file diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmon_osrestart_tests.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmon_osrestart_tests.iby Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,26 @@ +// Copyright (c) 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: This iby exports binaries and scripts for tests that require the OS to shutdown/restart. As such they are part of a separate ROM. +// + +#ifndef __SYSMON_OSRESTART_TESTS_IBY__ +#define __SYSMON_OSRESTART_TESTS_IBY__ + +data=ABI_DIR\BUILD_DIR\tsysmon_server.exe \sys\bin\tsysmon_server.exe +file=ABI_DIR\BUILD_DIR\sysmontesthelper.dll \sys\bin\sysmontesthelper.dll +data=ABI_DIR\BUILD_DIR\tsysmon_app_dontrendezvous.exe \sys\bin\tsysmon_app_dontrendezvous.exe + +data=DATAZ_\shmatest\shmatest_sysmon_restartos.script \shmatest\shmatest_sysmon_restartos.script +data=DATAZ_\shmatest\shmatest_sysmon_criticalnoretries.script \shmatest\shmatest_sysmon_criticalnoretries.script + +#endif // __SYSMON_OSRESTART_TESTS_IBY__ \ No newline at end of file diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmontest.iby --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmontest.iby Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmontest.iby Thu Sep 02 21:48:26 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" @@ -19,20 +19,14 @@ data=ABI_DIR\BUILD_DIR\tsysmon_server.exe \sys\bin\tsysmon_server.exe file=ABI_DIR\BUILD_DIR\sysmontesthelper.dll \sys\bin\sysmontesthelper.dll -data=ABI_DIR\BUILD_DIR\tsysmon_app_faileiofcount0.exe \sys\bin\tsysmon_app_faileiofcount0.exe -data=ABI_DIR\BUILD_DIR\tsysmon_app_faileiofcount1fail.exe \sys\bin\tsysmon_app_faileiofcount1fail.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_faileroscount1fail.exe \sys\bin\tsysmon_app_faileroscount1fail.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_faileroswmcount1fail.exe \sys\bin\tsysmon_app_faileroswmcount1fail.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_failcount2failquick.exe \sys\bin\tsysmon_app_failcount2failquick.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_failcount2failquick_slave.exe \sys\bin\tsysmon_app_failcount2failquick_slave.exe -data=ABI_DIR\BUILD_DIR\tsysmon_app_failcount2failwait.exe \sys\bin\tsysmon_app_failcount2failwait.exe -data=ABI_DIR\BUILD_DIR\tsysmon_app_failcount2failwait_slave.exe \sys\bin\tsysmon_app_failcount2failwait_slave.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_restartreg.exe \sys\bin\tsysmon_app_restartreg.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_restartfail.exe \sys\bin\tsysmon_app_restartfail.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_restartfailwithmode1.exe \sys\bin\tsysmon_app_restartfailwithmode1.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_restartfailwithmode2.exe \sys\bin\tsysmon_app_restartfailwithmode2.exe -data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregeiof.exe \sys\bin\tsysmon_app_startupregeiof.exe -data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregeioffailstart1.exe \sys\bin\tsysmon_app_startupregeioffailstart1.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregerosfaillater.exe \sys\bin\tsysmon_app_startupregerosfaillater.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregerosfailstart.exe \sys\bin\tsysmon_app_startupregerosfailstart.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregeroswmfaillater.exe \sys\bin\tsysmon_app_startupregeroswmfaillater.exe @@ -40,6 +34,7 @@ data=ABI_DIR\BUILD_DIR\tsysmon_app_startupregeioffailstart2.exe \sys\bin\tsysmon_app_startupregeioffailstart2.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_deregister.exe \sys\bin\tsysmon_app_deregister.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_donothing.exe \sys\bin\tsysmon_app_donothing.exe +data=ABI_DIR\BUILD_DIR\tsysmon_app_dontrendezvous.exe \sys\bin\tsysmon_app_dontrendezvous.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_register.exe \sys\bin\tsysmon_app_register.exe attrib=r data=ABI_DIR\BUILD_DIR\tsysmon_app_registercritical.exe \sys\bin\tsysmon_app_registercritical.exe data=ABI_DIR\BUILD_DIR\tsysmon_app_registertwice1proc.exe \sys\bin\tsysmon_app_registertwice1proc.exe @@ -52,10 +47,6 @@ data=DATAZ_\shmatest\configs\tsysmon.ini \shmatest\configs\tsysmon.ini data=DATAZ_\shmatest\shmatest_sysmon_conndiscon.script \shmatest\shmatest_sysmon_conndiscon.script -data=DATAZ_\shmatest\shmatest_sysmon_failcount2failquick.script \shmatest\shmatest_sysmon_failcount2failquick.script -data=DATAZ_\shmatest\shmatest_sysmon_failcount2failwait.script \shmatest\shmatest_sysmon_failcount2failwait.script -data=DATAZ_\shmatest\shmatest_sysmon_faileiofcount0.script \shmatest\shmatest_sysmon_faileiofcount0.script -data=DATAZ_\shmatest\shmatest_sysmon_faileiofcount1fail.script \shmatest\shmatest_sysmon_faileiofcount1fail.script data=DATAZ_\shmatest\shmatest_sysmon_faileroscount1fail.script \shmatest\shmatest_sysmon_faileroscount1fail.script data=DATAZ_\shmatest\shmatest_sysmon_faileroswmcount1fail.script \shmatest\shmatest_sysmon_faileroswmcount1fail.script data=DATAZ_\shmatest\shmatest_sysmon_failecnorcount1fail.script \shmatest\shmatest_sysmon_failecnorcount1fail.script @@ -63,8 +54,6 @@ data=DATAZ_\shmatest\shmatest_sysmon_restartfailwithmode1.script \shmatest\shmatest_sysmon_restartfailwithmode1.script data=DATAZ_\shmatest\shmatest_sysmon_restartfailwithmode2.script \shmatest\shmatest_sysmon_restartfailwithmode2.script data=DATAZ_\shmatest\shmatest_sysmon_restartreg.script \shmatest\shmatest_sysmon_restartreg.script -data=DATAZ_\shmatest\shmatest_sysmon_startupregeiof.script \shmatest\shmatest_sysmon_startupregeiof.script -data=DATAZ_\shmatest\shmatest_sysmon_startupregeioffailstart1.script \shmatest\shmatest_sysmon_startupregeioffailstart1.script data=DATAZ_\shmatest\shmatest_sysmon_startupregeioffailstart2.script \shmatest\shmatest_sysmon_startupregeioffailstart2.script data=DATAZ_\shmatest\shmatest_sysmon_startupregerosfaillater.script \shmatest\shmatest_sysmon_startupregerosfaillater.script data=DATAZ_\shmatest\shmatest_sysmon_startupregerosfailstart.script \shmatest\shmatest_sysmon_startupregerosfailstart.script diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmontesthelper.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmontesthelper.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/sysmontesthelper.mmp Thu Sep 02 21:48:26 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" @@ -16,6 +16,10 @@ TARGET sysmontesthelper.dll TARGETTYPE dll UID 0x1000008d 0x1028359d + +// The Secure ID used here is to be able to get +// the value of the restart count variable set by CMonitor in a P&S key +SECUREID 0x200086A8 TARGETPATH /sys/bin CAPABILITY ALL -TCB diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_failcount2failwait.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_failcount2failwait.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_failcount2failwait.mmp Thu Sep 02 21:48:26 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" @@ -16,8 +16,10 @@ TARGET tsysmon_app_failcount2failwait.exe TARGETTYPE exe UID 0 0x10283582 +SECUREID 0x200086A8 USERINCLUDE ../src +USERINCLUDE ../../../../../sysstatemgmt/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCEPATH ../src @@ -36,10 +38,5 @@ START RESOURCE appfwk-sysmon-0038_emulator0.rss TARGETPATH /private/2000d75b/startup/test END -#else - SOURCEPATH ../resource/hardware - START RESOURCE appfwk-sysmon-0038_hardware0.rss - TARGETPATH /private/2000d75b/startup/test - END #endif SMPSAFE diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_faileiofcount0.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_faileiofcount0.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_faileiofcount0.mmp Thu Sep 02 21:48:26 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" @@ -16,8 +16,10 @@ TARGET tsysmon_app_faileiofcount0.exe TARGETTYPE exe UID 0 0x10283594 +SECUREID 0x200086A8 USERINCLUDE ../src +USERINCLUDE ../../../../../sysstatemgmt/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCEPATH ../src @@ -38,7 +40,7 @@ END #else SOURCEPATH ../resource/hardware - START RESOURCE appfwk-sysmon-0033_hardware0.rss + START RESOURCE appfwk-sysmon-eiof_hardware0.rss TARGETPATH /private/2000d75b/startup/test END #endif diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_faileiofcount1fail.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_faileiofcount1fail.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_faileiofcount1fail.mmp Thu Sep 02 21:48:26 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" @@ -16,8 +16,10 @@ TARGET tsysmon_app_faileiofcount1fail.exe TARGETTYPE exe UID 0 0x10283579 +SECUREID 0x200086A8 USERINCLUDE ../src +USERINCLUDE ../../../../../sysstatemgmt/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCEPATH ../src @@ -36,10 +38,5 @@ START RESOURCE appfwk-sysmon-0034_emulator0.rss TARGETPATH /private/2000d75b/startup/test END -#else - SOURCEPATH ../resource/hardware - START RESOURCE appfwk-sysmon-0034_hardware0.rss - TARGETPATH /private/2000d75b/startup/test - END #endif SMPSAFE diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_startupregeiof.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_startupregeiof.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_startupregeiof.mmp Thu Sep 02 21:48:26 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" @@ -16,8 +16,10 @@ TARGET tsysmon_app_startupregeiof.exe TARGETTYPE exe UID 0 0x10283588 +SECUREID 0x200086A8 USERINCLUDE ../src +USERINCLUDE ../../../../../sysstatemgmt/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCEPATH ../src @@ -36,10 +38,5 @@ START RESOURCE appfwk-sysmon-0043_emulator0.rss TARGETPATH /private/2000d75b/startup/test END -#else - SOURCEPATH ../resource/hardware - START RESOURCE appfwk-sysmon-0043_hardware0.rss - TARGETPATH /private/2000d75b/startup/test - END #endif SMPSAFE diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_startupregeioffailstart1.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_startupregeioffailstart1.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_app_startupregeioffailstart1.mmp Thu Sep 02 21:48:26 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" @@ -16,8 +16,10 @@ TARGET tsysmon_app_startupregeioffailstart1.exe TARGETTYPE exe UID 0 0x10283589 +SECUREID 0x200086A8 USERINCLUDE ../src +USERINCLUDE ../../../../../sysstatemgmt/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCEPATH ../src @@ -34,10 +36,5 @@ START RESOURCE appfwk-sysmon-0044_emulator0.rss TARGETPATH /private/2000d75b/startup/test END -#else - SOURCEPATH ../resource/hardware - START RESOURCE appfwk-sysmon-0044_hardware0.rss - TARGETPATH /private/2000d75b/startup/test - END #endif SMPSAFE diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_server.mmp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_server.mmp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/group/tsysmon_server.mmp Thu Sep 02 21:48:26 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" @@ -50,6 +50,7 @@ SOURCE tsysmon_steploadsysmon.cpp SOURCE tsysmon_stepoomsysmon.cpp SOURCE tsysmon_stepcancelallmonitors.cpp +SOURCE tsysmon_steposrestarttest.cpp LIBRARY euser.lib LIBRARY testexecuteutils.lib diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0033_hardware0.rss --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0033_hardware0.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,316 +0,0 @@ -// Copyright (c) 2005-2009 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: -// Modified default resource file to test system monitor -// WARNING: Any changes made to this resource file must be -// checked against the system starter test cases. -// Specifically: -// - AppStartCs -// -// - -#include -#include -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalStatic; - resource_id = r_critical_static_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalDynamic; - resource_id = r_critical_dynamic_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNetworkingCritical; - resource_id = r_networking_critical_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNonCritical; - resource_id = r_non_critical_commands; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_critical_static_commands - { - commands = - { - r_increment_boot_count - , r_command_publish_system_state - , r_command_ssmutilsrv - , r_command_sysmon - , r_command_sysagt2svr - , r_command_fbserv - , r_command_wserv - , r_command_set_splash_property - , r_command_start_splash - , r_command_eiksrvs - , r_command_tzserver - }; - } - -RESOURCE SSM_COMMAND_LIST r_critical_dynamic_commands - { - commands = - { - r_command_publish_system_state - , r_command_initialise_locale - , r_command_apparc - , r_command_shell - , r_command_multiple_wait - , r_command_remove_splash_property - }; - } - -RESOURCE SSM_COMMAND_LIST r_networking_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_c32start - , r_command_msexe - , r_command_watcher - }; - } - -RESOURCE SSM_COMMAND_LIST r_non_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_system_ams - , r_command_swidaemon - , r_command_cntsrv - , r_command_agsvexe - , r_command_fotaagent - , r_command_schexe - , r_command_ama_starter - , r_command_app_faileiofcount0 - }; - } - - -RESOURCE SSM_START_PROCESS_INFO r_command_ssmutilsrv - { - severity = ECmdCriticalSeverity; - name = "ssmutilsrv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysmon - { - severity = ECmdCriticalSeverity; - name = "sysmon.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysagt2svr - { - severity = ECmdCriticalSeverity; - name = "SysAgt2Svr.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fbserv - { - severity = ECmdCriticalSeverity; - name = "fbserv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_wserv - { - severity = ECmdCriticalSeverity; - name = "ewsrv.exe"; - args = "-NoShell"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_set_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_start_splash - { - severity = ECmdCriticalSeverity; - name = "splash.exe"; - execution_behaviour = ESsmFireAndForget; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_eiksrvs - { - severity = ECmdCriticalSeverity; - name = "eiksrvs.exe"; - args = "-OnlyStartDependentServers"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_tzserver - { - severity = ECmdCriticalSeverity; - name = "tzserver.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_initialise_locale - { - name = "initialiselocale.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_apparc - { - severity = ECmdCriticalSeverity; - name = "apsexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_APP_INFO r_command_shell - { - severity = ECmdCriticalSeverity; - name = "shell.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - viewless = 1; - } - -RESOURCE SSM_MULTIPLE_WAIT r_command_multiple_wait - { - timeout = 20000; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_remove_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - value = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_c32start - { - severity = ECmdCriticalSeverity; - name = "c32start.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_msexe - { - severity = ECmdCriticalSeverity; - name = "msexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_watcher - { - severity = ECmdCriticalSeverity; - name = "watcher.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_system_ams - { - name = "SystemAMS.exe"; - args = "-boot"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_swidaemon - { - severity = ECmdCriticalSeverity; - name = "swidaemon.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_cntsrv - { - severity = ECmdCriticalSeverity; - name = "cntsrv.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_agsvexe - { - severity = ECmdCriticalSeverity; - name = "agsvexe.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fotaagent - { - name = "fotaagent.exe"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_schexe - { - name = "schexe.exe"; - args = "sysstartschexe"; - } - -RESOURCE SSM_START_AMA_STARTER r_command_ama_starter - { - severity = ECmdIgnoreFailure; - dsc_id = 0x2000836D; // removing this id will cause a rcomp failure unless dsc_id is #defined in ssmcmd.rh file. - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count - { - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "cmncustomcmds.dll"; - ordinal = 1; // Persist reboots custom command is at ordinal 1 - dll_data = r_increment; - } - -RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment - { - val = EIncrementBootCount; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_app_faileiofcount0 - { - name = "tsysmon_app_faileiofcount0.exe"; - args = "APPFWK-SYSMON-0033"; - } - - diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0034_hardware0.rss --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0034_hardware0.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,315 +0,0 @@ -// Copyright (c) 2005-2009 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: -// Modified default resource file to test system monitor -// WARNING: Any changes made to this resource file must be -// checked against the system starter test cases. -// Specifically: -// - AppStartCs -// -// - -#include -#include -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalStatic; - resource_id = r_critical_static_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalDynamic; - resource_id = r_critical_dynamic_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNetworkingCritical; - resource_id = r_networking_critical_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNonCritical; - resource_id = r_non_critical_commands; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_critical_static_commands - { - commands = - { - r_increment_boot_count - , r_command_publish_system_state - , r_command_ssmutilsrv - , r_command_sysmon - , r_command_sysagt2svr - , r_command_fbserv - , r_command_wserv - , r_command_set_splash_property - , r_command_start_splash - , r_command_eiksrvs - , r_command_tzserver - }; - } - -RESOURCE SSM_COMMAND_LIST r_critical_dynamic_commands - { - commands = - { - r_command_publish_system_state - , r_command_initialise_locale - , r_command_apparc - , r_command_shell - , r_command_multiple_wait - , r_command_remove_splash_property - }; - } - -RESOURCE SSM_COMMAND_LIST r_networking_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_c32start - , r_command_msexe - , r_command_watcher - }; - } - -RESOURCE SSM_COMMAND_LIST r_non_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_system_ams - , r_command_swidaemon - , r_command_cntsrv - , r_command_agsvexe - , r_command_fotaagent - , r_command_schexe - , r_command_ama_starter - , r_command_app_faileiofcount1fail - }; - } - - -RESOURCE SSM_START_PROCESS_INFO r_command_ssmutilsrv - { - severity = ECmdCriticalSeverity; - name = "ssmutilsrv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysmon - { - severity = ECmdCriticalSeverity; - name = "sysmon.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysagt2svr - { - severity = ECmdCriticalSeverity; - name = "SysAgt2Svr.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fbserv - { - severity = ECmdCriticalSeverity; - name = "fbserv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_wserv - { - severity = ECmdCriticalSeverity; - name = "ewsrv.exe"; - args = "-NoShell"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_set_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_start_splash - { - severity = ECmdCriticalSeverity; - name = "splash.exe"; - execution_behaviour = ESsmFireAndForget; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_eiksrvs - { - severity = ECmdCriticalSeverity; - name = "eiksrvs.exe"; - args = "-OnlyStartDependentServers"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_tzserver - { - severity = ECmdCriticalSeverity; - name = "tzserver.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_initialise_locale - { - name = "initialiselocale.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_apparc - { - severity = ECmdCriticalSeverity; - name = "apsexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_APP_INFO r_command_shell - { - severity = ECmdCriticalSeverity; - name = "shell.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - viewless = 1; - } - -RESOURCE SSM_MULTIPLE_WAIT r_command_multiple_wait - { - timeout = 20000; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_remove_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - value = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_c32start - { - severity = ECmdCriticalSeverity; - name = "c32start.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_msexe - { - severity = ECmdCriticalSeverity; - name = "msexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_watcher - { - severity = ECmdCriticalSeverity; - name = "watcher.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_system_ams - { - name = "SystemAMS.exe"; - args = "-boot"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_swidaemon - { - severity = ECmdCriticalSeverity; - name = "swidaemon.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_cntsrv - { - severity = ECmdCriticalSeverity; - name = "cntsrv.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_agsvexe - { - severity = ECmdCriticalSeverity; - name = "agsvexe.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fotaagent - { - name = "fotaagent.exe"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_schexe - { - name = "schexe.exe"; - args = "sysstartschexe"; - } - -RESOURCE SSM_START_AMA_STARTER r_command_ama_starter - { - severity = ECmdIgnoreFailure; - dsc_id = 0x2000836D; // removing this id will cause a rcomp failure unless dsc_id is #defined in ssmcmd.rh file. - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count - { - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "cmncustomcmds.dll"; - ordinal = 1; // Persist reboots custom command is at ordinal 1 - dll_data = r_increment; - } - -RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment - { - val = EIncrementBootCount; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_app_faileiofcount1fail - { - name = "tsysmon_app_faileiofcount1fail.exe"; - args = "APPFWK-SYSMON-0034"; - } - diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0038_hardware0.rss --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0038_hardware0.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,316 +0,0 @@ -// Copyright (c) 2005-2009 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: -// Modified default resource file to test system monitor -// WARNING: Any changes made to this resource file must be -// checked against the system starter test cases. -// Specifically: -// - AppStartCs -// -// - -#include -#include -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalStatic; - resource_id = r_critical_static_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalDynamic; - resource_id = r_critical_dynamic_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNetworkingCritical; - resource_id = r_networking_critical_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNonCritical; - resource_id = r_non_critical_commands; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_critical_static_commands - { - commands = - { - r_increment_boot_count - , r_command_publish_system_state - , r_command_ssmutilsrv - , r_command_sysmon - , r_command_sysagt2svr - , r_command_fbserv - , r_command_wserv - , r_command_set_splash_property - , r_command_start_splash - , r_command_eiksrvs - , r_command_tzserver - }; - } - -RESOURCE SSM_COMMAND_LIST r_critical_dynamic_commands - { - commands = - { - r_command_publish_system_state - , r_command_initialise_locale - , r_command_apparc - , r_command_shell - , r_command_multiple_wait - , r_command_remove_splash_property - }; - } - -RESOURCE SSM_COMMAND_LIST r_networking_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_c32start - , r_command_msexe - , r_command_watcher - }; - } - -RESOURCE SSM_COMMAND_LIST r_non_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_system_ams - , r_command_swidaemon - , r_command_cntsrv - , r_command_agsvexe - , r_command_fotaagent - , r_command_schexe - , r_command_ama_starter - , r_command_app_failcount2failwait - }; - } - - -RESOURCE SSM_START_PROCESS_INFO r_command_ssmutilsrv - { - severity = ECmdCriticalSeverity; - name = "ssmutilsrv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysmon - { - severity = ECmdCriticalSeverity; - name = "sysmon.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysagt2svr - { - severity = ECmdCriticalSeverity; - name = "SysAgt2Svr.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fbserv - { - severity = ECmdCriticalSeverity; - name = "fbserv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_wserv - { - severity = ECmdCriticalSeverity; - name = "ewsrv.exe"; - args = "-NoShell"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_set_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_start_splash - { - severity = ECmdCriticalSeverity; - name = "splash.exe"; - execution_behaviour = ESsmFireAndForget; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_eiksrvs - { - severity = ECmdCriticalSeverity; - name = "eiksrvs.exe"; - args = "-OnlyStartDependentServers"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_tzserver - { - severity = ECmdCriticalSeverity; - name = "tzserver.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_initialise_locale - { - name = "initialiselocale.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_apparc - { - severity = ECmdCriticalSeverity; - name = "apsexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_APP_INFO r_command_shell - { - severity = ECmdCriticalSeverity; - name = "shell.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - viewless = 1; - } - -RESOURCE SSM_MULTIPLE_WAIT r_command_multiple_wait - { - timeout = 20000; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_remove_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - value = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_c32start - { - severity = ECmdCriticalSeverity; - name = "c32start.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_msexe - { - severity = ECmdCriticalSeverity; - name = "msexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_watcher - { - severity = ECmdCriticalSeverity; - name = "watcher.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_system_ams - { - name = "SystemAMS.exe"; - args = "-boot"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_swidaemon - { - severity = ECmdCriticalSeverity; - name = "swidaemon.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_cntsrv - { - severity = ECmdCriticalSeverity; - name = "cntsrv.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_agsvexe - { - severity = ECmdCriticalSeverity; - name = "agsvexe.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fotaagent - { - name = "fotaagent.exe"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_schexe - { - name = "schexe.exe"; - args = "sysstartschexe"; - } - -RESOURCE SSM_START_AMA_STARTER r_command_ama_starter - { - severity = ECmdIgnoreFailure; - dsc_id = 0x2000836D; // removing this id will cause a rcomp failure unless dsc_id is #defined in ssmcmd.rh file. - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count - { - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "cmncustomcmds.dll"; - ordinal = 1; // Persist reboots custom command is at ordinal 1 - dll_data = r_increment; - } - -RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment - { - val = EIncrementBootCount; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_app_failcount2failwait - { - name = "tsysmon_app_failcount2failwait.exe"; - args = "APPFWK-SYSMON-0038"; - } - - diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0043_hardware0.rss --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0043_hardware0.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,326 +0,0 @@ -// Copyright (c) 2005-2009 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: -// Modified default resource file to test system monitor -// WARNING: Any changes made to this resource file must be -// checked against the system starter test cases. -// Specifically: -// - AppStartCs -// -// - -#include -#include -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalStatic; - resource_id = r_critical_static_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalDynamic; - resource_id = r_critical_dynamic_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNetworkingCritical; - resource_id = r_networking_critical_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNonCritical; - resource_id = r_non_critical_commands; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_critical_static_commands - { - commands = - { - r_increment_boot_count - , r_command_publish_system_state - , r_command_ssmutilsrv - , r_command_sysmon - , r_command_sysagt2svr - , r_command_fbserv - , r_command_wserv - , r_command_set_splash_property - , r_command_start_splash - , r_command_eiksrvs - , r_command_tzserver - , r_command_app_startupregeiof - }; - } - -RESOURCE SSM_COMMAND_LIST r_critical_dynamic_commands - { - commands = - { - r_command_publish_system_state - , r_command_initialise_locale - , r_command_apparc - , r_command_shell - , r_command_multiple_wait - , r_command_remove_splash_property - }; - } - -RESOURCE SSM_COMMAND_LIST r_networking_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_c32start - , r_command_msexe - , r_command_watcher - }; - } - -RESOURCE SSM_COMMAND_LIST r_non_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_system_ams - , r_command_swidaemon - , r_command_cntsrv - , r_command_agsvexe - , r_command_fotaagent - , r_command_schexe - , r_command_ama_starter - }; - } - - -RESOURCE SSM_START_PROCESS_INFO r_command_ssmutilsrv - { - severity = ECmdCriticalSeverity; - name = "ssmutilsrv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysmon - { - severity = ECmdCriticalSeverity; - name = "sysmon.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysagt2svr - { - severity = ECmdCriticalSeverity; - name = "SysAgt2Svr.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fbserv - { - severity = ECmdCriticalSeverity; - name = "fbserv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_wserv - { - severity = ECmdCriticalSeverity; - name = "ewsrv.exe"; - args = "-NoShell"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_set_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_start_splash - { - severity = ECmdCriticalSeverity; - name = "splash.exe"; - execution_behaviour = ESsmFireAndForget; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_eiksrvs - { - severity = ECmdCriticalSeverity; - name = "eiksrvs.exe"; - args = "-OnlyStartDependentServers"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_tzserver - { - severity = ECmdCriticalSeverity; - name = "tzserver.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_app_startupregeiof - { - severity = ECmdCriticalSeverity; - name = "tsysmon_app_startupregeiof.exe"; - args = "APPFWK-SYSMON-0043"; - execution_behaviour = ESsmWaitForSignal; - monitor_info = r_command_monitor; - } - -RESOURCE SSM_MONITOR_INFO r_command_monitor - { - restart_policy = ESsmIgnoreOnFailure; - restart_mode = 0; - timeout = 0; - retries = 0; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_initialise_locale - { - name = "initialiselocale.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_apparc - { - severity = ECmdCriticalSeverity; - name = "apsexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_APP_INFO r_command_shell - { - severity = ECmdCriticalSeverity; - name = "shell.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - viewless = 1; - } - -RESOURCE SSM_MULTIPLE_WAIT r_command_multiple_wait - { - timeout = 20000; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_remove_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - value = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_c32start - { - severity = ECmdCriticalSeverity; - name = "c32start.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_msexe - { - severity = ECmdCriticalSeverity; - name = "msexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_watcher - { - severity = ECmdCriticalSeverity; - name = "watcher.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_system_ams - { - name = "SystemAMS.exe"; - args = "-boot"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_swidaemon - { - severity = ECmdCriticalSeverity; - name = "swidaemon.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_cntsrv - { - severity = ECmdCriticalSeverity; - name = "cntsrv.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_agsvexe - { - severity = ECmdCriticalSeverity; - name = "agsvexe.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fotaagent - { - name = "fotaagent.exe"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_schexe - { - name = "schexe.exe"; - args = "sysstartschexe"; - } - -RESOURCE SSM_START_AMA_STARTER r_command_ama_starter - { - severity = ECmdIgnoreFailure; - dsc_id = 0x2000836D; // removing this id will cause a rcomp failure unless dsc_id is #defined in ssmcmd.rh file. - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count - { - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "cmncustomcmds.dll"; - ordinal = 1; // Persist reboots custom command is at ordinal 1 - dll_data = r_increment; - } - -RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment - { - val = EIncrementBootCount; - } - diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0044_hardware0.rss --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-0044_hardware0.rss Wed Aug 18 11:03:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,326 +0,0 @@ -// Copyright (c) 2005-2009 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: -// Modified default resource file to test system monitor -// WARNING: Any changes made to this resource file must be -// checked against the system starter test cases. -// Specifically: -// - AppStartCs -// -// - -#include -#include -#include -#include - -UID2 KUidSsmCommandListResourceFile - -// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. -// The SSM relies on this having a resource ID of 1. -RESOURCE SSM_COMMAND_LIST_ROOT - { - command_list_mapping = r_command_list_mapping; - } - -RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping - { - mappings = - { - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalStatic; - resource_id = r_critical_static_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateCriticalDynamic; - resource_id = r_critical_dynamic_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNetworkingCritical; - resource_id = r_networking_critical_commands; - }, - SSM_COMMANDLISTID_TO_RESOURCEID - { - command_list_id = ESsmStartupSubStateNonCritical; - resource_id = r_non_critical_commands; - } - }; - } - - -RESOURCE SSM_COMMAND_LIST r_critical_static_commands - { - commands = - { - r_increment_boot_count - , r_command_publish_system_state - , r_command_ssmutilsrv - , r_command_sysmon - , r_command_sysagt2svr - , r_command_fbserv - , r_command_wserv - , r_command_set_splash_property - , r_command_start_splash - , r_command_eiksrvs - , r_command_tzserver - , r_command_app_startupregeioffailstart1 - }; - } - -RESOURCE SSM_COMMAND_LIST r_critical_dynamic_commands - { - commands = - { - r_command_publish_system_state - , r_command_initialise_locale - , r_command_apparc - , r_command_shell - , r_command_multiple_wait - , r_command_remove_splash_property - }; - } - -RESOURCE SSM_COMMAND_LIST r_networking_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_c32start - , r_command_msexe - , r_command_watcher - }; - } - -RESOURCE SSM_COMMAND_LIST r_non_critical_commands - { - commands = - { - r_command_publish_system_state - , r_command_system_ams - , r_command_swidaemon - , r_command_cntsrv - , r_command_agsvexe - , r_command_fotaagent - , r_command_schexe - , r_command_ama_starter - }; - } - - -RESOURCE SSM_START_PROCESS_INFO r_command_ssmutilsrv - { - severity = ECmdCriticalSeverity; - name = "ssmutilsrv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysmon - { - severity = ECmdCriticalSeverity; - name = "sysmon.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_sysagt2svr - { - severity = ECmdCriticalSeverity; - name = "SysAgt2Svr.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fbserv - { - severity = ECmdCriticalSeverity; - name = "fbserv.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_wserv - { - severity = ECmdCriticalSeverity; - name = "ewsrv.exe"; - args = "-NoShell"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_set_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_start_splash - { - severity = ECmdCriticalSeverity; - name = "splash.exe"; - execution_behaviour = ESsmFireAndForget; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_eiksrvs - { - severity = ECmdCriticalSeverity; - name = "eiksrvs.exe"; - args = "-OnlyStartDependentServers"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_tzserver - { - severity = ECmdCriticalSeverity; - name = "tzserver.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_app_startupregeioffailstart1 - { - severity = ECmdCriticalSeverity; - name = "tsysmon_app_startupregeioffailstart1.exe"; - args = "APPFWK-SYSMON-0044"; - execution_behaviour = ESsmWaitForSignal; - monitor_info = r_command_monitor; - } - -RESOURCE SSM_MONITOR_INFO r_command_monitor - { - restart_policy = ESsmIgnoreOnFailure; - restart_mode = 0; - timeout = 0; - retries = 0; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_initialise_locale - { - name = "initialiselocale.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_apparc - { - severity = ECmdCriticalSeverity; - name = "apsexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_APP_INFO r_command_shell - { - severity = ECmdCriticalSeverity; - name = "shell.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - viewless = 1; - } - -RESOURCE SSM_MULTIPLE_WAIT r_command_multiple_wait - { - timeout = 20000; - } - -RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_command_remove_splash_property - { - severity = ECmdCriticalSeverity; - category = 0x2000D75B; - key = 0x01; - value = 1; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_c32start - { - severity = ECmdCriticalSeverity; - name = "c32start.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_msexe - { - severity = ECmdCriticalSeverity; - name = "msexe.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_watcher - { - severity = ECmdCriticalSeverity; - name = "watcher.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_system_ams - { - name = "SystemAMS.exe"; - args = "-boot"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_swidaemon - { - severity = ECmdCriticalSeverity; - name = "swidaemon.exe"; - execution_behaviour = ESsmWaitForSignal; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_cntsrv - { - severity = ECmdCriticalSeverity; - name = "cntsrv.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_agsvexe - { - severity = ECmdCriticalSeverity; - name = "agsvexe.exe"; - args = "-nontransient"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_fotaagent - { - name = "fotaagent.exe"; - } - -RESOURCE SSM_START_PROCESS_INFO r_command_schexe - { - name = "schexe.exe"; - args = "sysstartschexe"; - } - -RESOURCE SSM_START_AMA_STARTER r_command_ama_starter - { - severity = ECmdIgnoreFailure; - dsc_id = 0x2000836D; // removing this id will cause a rcomp failure unless dsc_id is #defined in ssmcmd.rh file. - } - -RESOURCE SSM_PUBLISH_SYSTEM_STATE r_command_publish_system_state - { - severity = ECmdCriticalSeverity; - } - -RESOURCE SSM_START_CUSTOM_COMMAND r_increment_boot_count - { - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "cmncustomcmds.dll"; - ordinal = 1; // Persist reboots custom command is at ordinal 1 - dll_data = r_increment; - } - -RESOURCE SSM_COMMAND_PERSIST_REBOOTS r_increment - { - val = EIncrementBootCount; - } - diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-eiof_hardware0.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/resource/hardware/appfwk-sysmon-eiof_hardware0.rss Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,113 @@ +// Copyright (c) 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: +// Resource file to add exes that are started during boot-up +// with IgnoreOnFailure policy +// +// + +#include +#include +#include +#include +#include "ssmsubstateext.hrh" + +UID2 KUidSsmCommandListResourceFile + +// SSM_COMMAND_LIST_ROOT must be the first resource in a command list resource file. +// The SSM relies on this having a resource ID of 1. +RESOURCE SSM_COMMAND_LIST_ROOT + { + command_list_mapping = r_command_list_mapping; + } + +RESOURCE SSM_COMMAND_LIST_MAPPING r_command_list_mapping + { + mappings = + { + SSM_COMMANDLISTID_TO_RESOURCEID + { + command_list_id = ESsmStateStartingCriticalApps; + resource_id = r_cmds_critical; + }, + SSM_COMMANDLISTID_TO_RESOURCEID + { + command_list_id = ESsmStateNonCritical; + resource_id = r_cmds_noncritical; + } + }; + } + +RESOURCE SSM_COMMAND_LIST r_cmds_critical + { + commands = + { + r_command_app_startupregeiof, + r_command_app_startupregeioffailstart1 + }; + } + +RESOURCE SSM_COMMAND_LIST r_cmds_noncritical + { + commands = + { + r_command_app_faileiofcount0, + r_command_app_faileiofcount1fail, + r_command_app_failcount2failwait + }; + } + +RESOURCE SSM_START_PROCESS_INFO r_command_app_startupregeiof + { + severity = ECmdCriticalSeverity; + name = "tsysmon_app_startupregeiof.exe"; + args = "43"; + execution_behaviour = ESsmWaitForSignal; + monitor_info = r_command_monitor; + } + +RESOURCE SSM_START_PROCESS_INFO r_command_app_startupregeioffailstart1 + { + severity = ECmdIgnoreFailure; + name = "tsysmon_app_startupregeioffailstart1.exe"; + args = "44"; + execution_behaviour = ESsmWaitForSignal; + monitor_info = r_command_monitor; + } + +RESOURCE SSM_MONITOR_INFO r_command_monitor + { + restart_policy = ESsmIgnoreOnFailure; + restart_mode = 0; + timeout = 0; + retries = 0; + } + +RESOURCE SSM_START_PROCESS_INFO r_command_app_faileiofcount0 + { + name = "tsysmon_app_faileiofcount0.exe"; + args = "APPFWK-SYSMON-0033"; + } + +RESOURCE SSM_START_PROCESS_INFO r_command_app_faileiofcount1fail + { + name = "tsysmon_app_faileiofcount1fail.exe"; + args = "APPFWK-SYSMON-0034"; + } + +RESOURCE SSM_START_PROCESS_INFO r_command_app_failcount2failwait + { + name = "tsysmon_app_failcount2failwait.exe"; + args = "APPFWK-SYSMON-0038"; + } + diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_criticalnoretries.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_criticalnoretries.script Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,39 @@ +// Copyright (c) 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: +// + +PRINT Run CriticalNoRetries test + +LOAD_SUITE tsysmon_server + +START_TESTCASE DEVSRVS-SHMA-SYSMON-0054 +//! @SYMTestCaseID DEVSRVS-SHMA-SYSMON-0054 +//! @SYMPREQ +//! @SYMREQ +//! @SYMTestType UT +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestCaseDesc A process with ECriticalNoRetries recovery policy restarts the OS without retrying to restart the process +//! @SYMTestActions 1. Start a process +//! 2. Call RSysMonSession::Monitor() using startupproperties for this process with EWaitForStart, retry count = 1, +//! and ECriticalNoRetries +//! 3. Kill the process +//! 4. The test shouldn't try to start the process again. It should restart the OS without any retries - this +//! is the actual test +//! @SYMTestExpectedResults pass +RUN_TEST_STEP 100 tsysmon_server CriticalNoRetriesStep +END_TESTCASE DEVSRVS-SHMA-SYSMON-0054 + +RUN_UTILS MakeReadWrite c:\testdata\runcounts\tsysmon_app_dontrendezvous.exe.txt +RUN_UTILS DeleteFile c:\testdata\runcounts\tsysmon_app_dontrendezvous.exe.txt \ No newline at end of file diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_failcount2failwait.script --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_failcount2failwait.script Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_failcount2failwait.script Thu Sep 02 21:48:26 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" @@ -27,7 +27,7 @@ //! @SYMREQ REQ6600 REQ6603 REQ6830 REQ9457 //! @SYMTestType CIT //! @SYMTestPriority Critical -//! @SYMTestCaseDependencies appfwk-sysmon-0038_0.rsc must be used in place of SSCForStartupMode0.rsc +//! @SYMTestCaseDependencies appfwk-sysmon-0038_0.rsc is merged with noncriticalcmdlist.rsc //! @SYMTestCaseDesc Register a process for monitoring with retry limit = 2, fail the process twice with a pause //! @SYMTestActions A process is registered. Failure policy is not important. //! Fail the process. @@ -37,5 +37,5 @@ //! @SYMTestExpectedResults The process is restarted again immediately, and reregistered. // START_TESTCASE DEVSRVS-SHMA-SYSMON-0038 -RUN_TEST_STEP 100 tsysmon_server ResultCheck z:\shmatest\configs\tsysmon.ini APPFWK-SYSMON-0038 +RUN_TEST_STEP 100 tsysmon_server ResultCheck z:\shmatest\configs\tsysmon.ini 38 END_TESTCASE DEVSRVS-SHMA-SYSMON-0038 diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_faileiofcount0.script --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_faileiofcount0.script Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_faileiofcount0.script Thu Sep 02 21:48:26 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" @@ -27,7 +27,7 @@ //! @SYMREQ REQ6595 REQ6603 REQ9457 //! @SYMTestType CIT //! @SYMTestPriority Critical -//! @SYMTestCaseDependencies appfwk-sysmon-0033_0.rsc must be used in place of SSCForStartupMode0.rsc +//! @SYMTestCaseDependencies appfwk-sysmon-0033_0.rsc is merged with noncriticalcmdlist.rsc //! @SYMTestCaseDesc Register a process for monitoring, with retry count = 0, 'EIgnoreOnFailure' policy, fail the process //! @SYMTestActions A process is registered with the 'EIgnoreOnFailure' policy. //! Fail the process. diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_faileiofcount1fail.script --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_faileiofcount1fail.script Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_faileiofcount1fail.script Thu Sep 02 21:48:26 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" @@ -27,7 +27,7 @@ //! @SYMREQ REQ6595 REQ6760 REQ9457 //! @SYMTestType CIT //! @SYMTestPriority Critical -//! @SYMTestCaseDependencies appfwk-sysmon-0034_0.rsc must be used in place of SSCForStartupMode0.rsc +//! @SYMTestCaseDependencies appfwk-sysmon-0034_0.rsc is merged with noncriticalcmdlist.rsc //! @SYMTestCaseDesc Register a process for monitoring with retry limit = 1 and 'EIgnoreOnFailure' policy, fail the process //! @SYMTestActions A process is registered with the 'EIgnoreOnFailure' policy. //! Fail the process. diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_restartos.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_restartos.script Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,39 @@ +// Copyright (c) 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: +// + +PRINT Run RestartOS test + +LOAD_SUITE tsysmon_server + +START_TESTCASE DEVSRVS-SHMA-SYSMON-0035 +//! @SYMTestCaseID DEVSRVS-SHMA-SYSMON-0035 +//! @SYMPREQ +//! @SYMREQ +//! @SYMTestType UT +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestCaseDesc A process with ERestartOS recovery policy restarts the OS after retrying the specified number of times +//! @SYMTestActions 1. Start a process +//! 2. Call RSysMonSession::Monitor() using startupproperties for this process with EWaitForStart, retry count = 1, +//! and ERestartOS +//! 3. Kill the process +//! 4. Then the process restarts again and fails +//! 5. This will cause the OS to restart. +//! @SYMTestExpectedResults pass +RUN_TEST_STEP 100 tsysmon_server RestartOSStep +END_TESTCASE DEVSRVS-SHMA-SYSMON-0035 + +RUN_UTILS MakeReadWrite c:\testdata\runcounts\tsysmon_app_dontrendezvous.exe.txt +RUN_UTILS DeleteFile c:\testdata\runcounts\tsysmon_app_dontrendezvous.exe.txt \ No newline at end of file diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_startupregeiof.script --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_startupregeiof.script Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_startupregeiof.script Thu Sep 02 21:48:26 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" @@ -27,12 +27,12 @@ //! @SYMREQ REQ6604 REQ9457 //! @SYMTestType CIT //! @SYMTestPriority Critical -//! @SYMTestCaseDependencies appfwk-sysmon-0043_0.rsc must be used in place of SSCForStartupMode0.rsc +//! @SYMTestCaseDependencies appfwk-sysmon-0043_0.rsc is merged with criticalappscmdlist.rsc //! @SYMTestCaseDesc Use the new startup configuration format to register for process monitoring, with 'EIgnoreOnFailure' policy. -//! @SYMTestActions Create a startup configuration that includes a process with the 'EIgnoreOnFailure' policy in the Critical Static startup state. +//! @SYMTestActions Create a startup configuration that includes a process with the 'EIgnoreOnFailure' policy in the ESsmStateStartingCriticalApps state. //! Boot the device. //! @SYMTestExpectedResults The process should be registered with the parameters defined in the startup configuration. // START_TESTCASE DEVSRVS-SHMA-SYSMON-0043 -RUN_TEST_STEP 100 tsysmon_server ResultCheck z:\shmatest\configs\tsysmon.ini APPFWK-SYSMON-0043 +RUN_TEST_STEP 100 tsysmon_server ResultCheck z:\shmatest\configs\tsysmon.ini 43 END_TESTCASE DEVSRVS-SHMA-SYSMON-0043 diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_startupregeioffailstart1.script --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_startupregeioffailstart1.script Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/scripts/shmatest_sysmon_startupregeioffailstart1.script Thu Sep 02 21:48:26 2010 +0300 @@ -1,5 +1,4 @@ -// -// 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" @@ -27,7 +26,7 @@ //! @SYMREQ REQ6604 REQ9457 //! @SYMTestType CIT //! @SYMTestPriority Critical -//! @SYMTestCaseDependencies appfwk-sysmon-0044_0.rsc must be used in place of SSCForStartupMode0.rsc +//! @SYMTestCaseDependencies appfwk-sysmon-0044_0.rsc is merged with criticalappscmdlist.rsc //! @SYMTestCaseDesc Use the new startup configuration format to register for process monitoring, with 'EIgnoreOnFailure' policy, have the process fail during startup. //! @SYMTestActions Create a SSC file which will contain an item for a test application with EStartupProcess2, EWaitForStart, retry count = 0, EIgnoreOnFailure, and monitor = 1. The test application will be in the Critical Static section. //! The test application records a count in a file to check whether it is being loaded first time or second time. diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/sysmontesthelper.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/sysmontesthelper.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/sysmontesthelper.cpp Thu Sep 02 21:48:26 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" @@ -22,6 +22,7 @@ #include "sysmontesthelper.h" #include #include +#include _LIT(KEIgnoreOnFailure, "EIgnoreOnFailure"); _LIT(KERestartOS, "ERestartOS"); @@ -135,6 +136,7 @@ fileName.Append(KResultsRoot); fileName.Append(aTestId); + RDebug::Print(_L("Checking in file: %S"), &fileName); RFs fs; User::LeaveIfError(fs.Connect()); CleanupClosePushL(fs); @@ -180,6 +182,7 @@ fileName.Append(KRunCountsRoot); fileName.Append(parse.NameAndExt()); fileName.Append(KTxtExtension); + RDebug::Print(_L("Checking in file: %S"), &fileName); RFileReadStream file; TInt err = 0; @@ -264,32 +267,11 @@ return result; } -EXPORT_C TInt CSysMonTestHelper::GetRegisterCountL() +EXPORT_C TInt CSysMonTestHelper::GetRegisterCount(TInt aKey) { - RFs fs; - User::LeaveIfError(fs.Connect()); - CleanupClosePushL(fs); - - RFile file; - TInt err = 0; - err = file.Open(fs, KRegisterCountFile, EFileRead); TInt result = 0; - if (err == KErrNotFound || err == KErrPathNotFound) - { - CleanupStack::PopAndDestroy(&fs); - } - else - { - CleanupClosePushL(file); - User::LeaveIfError(err); - TBuf8<11> content; - file.Read(content); - content.Delete(0,9); - TLex8 myLex(content); - User::LeaveIfError(myLex.Val(result)); - file.Close(); - CleanupStack::PopAndDestroy(2, &fs); - } + TInt error = RProperty::Get(KTestSysMon, aKey, result); + RDebug::Printf("RProperty::Get() with key %d returned with %d", aKey, error); return result; } diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/sysmontesthelper.h --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/sysmontesthelper.h Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/sysmontesthelper.h Thu Sep 02 21:48:26 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" @@ -47,6 +47,7 @@ _LIT(KRestartCountFile, "C:\\Restart_ResultFile.txt"); const TInt KMaxTestIdLength = 20; // TestId is of the format APPFWK-SYSMON-00xx +const TUid KTestSysMon={0x200086A8}; // Category value to be used to define restart P&S key class CSysMonTestHelper : public CBase { @@ -57,7 +58,7 @@ IMPORT_C static TInt ReadRunCountL(const TDesC& aProcessFilename); IMPORT_C static void IncrementRunCountL(const TDesC& aProcessFilename); IMPORT_C static TInt GetRestartCountL(); - IMPORT_C static TInt GetRegisterCountL(); + IMPORT_C static TInt GetRegisterCount(TInt aKey); IMPORT_C static CSysMonTestHelper* NewLC(); IMPORT_C static CSysMonTestHelper* NewL(); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_donothing.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_donothing.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_donothing.cpp Thu Sep 02 21:48:26 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,12 +26,11 @@ void MainL() { - RProcess::Rendezvous(KErrNone); - CCommandLineArguments* args = CCommandLineArguments::NewLC(); CSysMonTestHelper::IncrementRunCountL(args->Arg(0)); CleanupStack::PopAndDestroy(args); + RProcess::Rendezvous(KErrNone); while (ETrue) { User::After(5000000); // 5 seconds diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_failcount2failwait.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_failcount2failwait.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_failcount2failwait.cpp Thu Sep 02 21:48:26 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" @@ -20,12 +20,16 @@ */ #include "sysmontesthelper.h" +#include +const TUint32 KRestartExeCount = 38; TInt MainL() { RDebug::Print(_L("appfwk-sysmon-0038: MainL")); - + + TInt err = RProperty::Define(KTestSysMon, KRestartExeCount, RProperty::EInt); + RDebug::Printf("Defining P&S key with key %d returns with err %d", err, KRestartExeCount); TInt runCount = 0; CCommandLineArguments* args = CCommandLineArguments::NewLC(); runCount = CSysMonTestHelper::ReadRunCountL(args->Arg(0)); @@ -43,7 +47,7 @@ CleanupClosePushL(sysmon); TTime time1(); - CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_failcount2failwait_slave.exe"), _L("APPFWK-SYSMON-0038")); + CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_failcount2failwait_slave.exe"), _L("38")); props->SetMonitored(ETrue); props->SetStartupType(EStartProcess); props->SetStartMethod(EWaitForStart); @@ -54,7 +58,10 @@ RProcess slave1; slave1.Create(_L("tsysmon_app_failcount2failwait_slave.exe"), _L("APPFWK-SYSMON-0038")); CleanupClosePushL(slave1); - slave1.Resume(); + TRequestStatus status; + slave1.Rendezvous(status); + slave1.Resume(); + User::WaitForRequest(status); // Register with SysMon sysmon.MonitorL(*props, slave1); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_failcount2failwait_slave.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_failcount2failwait_slave.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_failcount2failwait_slave.cpp Thu Sep 02 21:48:26 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,7 +41,6 @@ { case 1: { - RProcess::Rendezvous(KErrNone); User::After(KWaitTime); time1.HomeTime(); datetime1 = time1.DateTime(); @@ -52,12 +51,12 @@ helper = CSysMonTestHelper::NewLC(); helper->WriteResultL(millisecs); + RProcess::Rendezvous(KErrNone); CleanupStack::PopAndDestroy(helper); break; } case 2: { - RProcess::Rendezvous(KErrNone); time1.HomeTime(); datetime1 = time1.DateTime(); millisecs = (datetime1.MicroSecond() / 1000) + @@ -66,7 +65,7 @@ (datetime1.Hour() * 60 * 60 * 1000); TInt secondRunTime; - CSysMonTestHelper::GetResultIntL(_L("APPFWK-SYSMON-0038"), secondRunTime); + CSysMonTestHelper::GetResultIntL(_L("38"), secondRunTime); CSysMonTestHelper* helper = CSysMonTestHelper::NewLC(); if ( (secondRunTime - millisecs) < 2000 ) @@ -77,6 +76,7 @@ { helper->WriteResultL(0); } + RProcess::Rendezvous(KErrNone); CleanupStack::PopAndDestroy(helper); keepRunning = ETrue; break; diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_faileiofcount0.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_faileiofcount0.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_faileiofcount0.cpp Thu Sep 02 21:48:26 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" @@ -19,8 +19,11 @@ @internalComponent - Internal Symbian test code */ +#include #include "sysmontesthelper.h" +const TUint32 KRestartExeCount = 33; + TInt MainL() { @@ -28,11 +31,14 @@ TInt runCount = 0; CCommandLineArguments* args = CCommandLineArguments::NewLC(); + TInt err = RProperty::Define(KTestSysMon, KRestartExeCount, RProperty::EInt); + RDebug::Printf("Defining P&S key with key %d returns with err %d", err, KRestartExeCount); + runCount = CSysMonTestHelper::ReadRunCountL(args->Arg(0)); CSysMonTestHelper::IncrementRunCountL(args->Arg(0)); CleanupStack::PopAndDestroy(args); - + RDebug::Printf("runCount = %d", runCount); switch (runCount) { case 0: @@ -42,7 +48,7 @@ sysmon.OpenL(); CleanupClosePushL(sysmon); - CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_donothing.exe"), KNullDesC); + CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_donothing.exe"), _L("33")); props->SetMonitored(ETrue); props->SetStartupType(EStartProcess); props->SetStartMethod(EWaitForStart); @@ -53,12 +59,15 @@ RProcess slave1; slave1.Create(_L("tsysmon_app_donothing.exe"), _L("5000")); CleanupClosePushL(slave1); + TRequestStatus status; + slave1.Rendezvous(status); slave1.Resume(); + User::WaitForRequest(status); // Register with SysMon sysmon.MonitorL(*props, slave1); slave1.Terminate(KErrNone); - + CleanupStack::PopAndDestroy(3, &sysmon); break; } @@ -68,6 +77,7 @@ break; } } + RDebug::Print(_L("appfwk-sysmon-0033: End MainL")); return KErrNone; } diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_faileiofcount1fail.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_faileiofcount1fail.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_faileiofcount1fail.cpp Thu Sep 02 21:48:26 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" @@ -19,8 +19,9 @@ @internalComponent - Internal Symbian test code */ +#include #include "sysmontesthelper.h" - +const TUint32 KRestartExeCount = 34; TInt MainL() { @@ -28,6 +29,8 @@ TInt runCount = 0; CCommandLineArguments* args = CCommandLineArguments::NewLC(); + TInt err = RProperty::Define(KTestSysMon, KRestartExeCount, RProperty::EInt); + RDebug::Printf("Defining P&S key with key %d returns with err %d", err, KRestartExeCount); runCount = CSysMonTestHelper::ReadRunCountL(args->Arg(0)); CSysMonTestHelper::IncrementRunCountL(args->Arg(0)); CleanupStack::PopAndDestroy(args); @@ -42,7 +45,7 @@ sysmon.OpenL(); CleanupClosePushL(sysmon); - CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_dontrendezvous.exe"), KNullDesC); + CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_dontrendezvous.exe"), _L("34")); props->SetMonitored(ETrue); props->SetStartupType(EStartProcess); props->SetStartMethod(EWaitForStart); @@ -53,7 +56,10 @@ RProcess slave1; slave1.Create(_L("tsysmon_app_dontrendezvous.exe"), _L("5000")); CleanupClosePushL(slave1); + TRequestStatus status; + slave1.Rendezvous(status); slave1.Resume(); + User::WaitForRequest(status); // Register with SysMon sysmon.MonitorL(*props, slave1); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_startupregeiof.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_startupregeiof.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_startupregeiof.cpp Thu Sep 02 21:48:26 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" @@ -20,9 +20,14 @@ */ #include "sysmontesthelper.h" +#include + +const TUint32 KRestartExeCount = 43; void MainL() { + TInt err = RProperty::Define(KTestSysMon, KRestartExeCount, RProperty::EInt); + RDebug::Printf("Defining P&S key with key %d returns with err %d", err, KRestartExeCount); RProcess::Rendezvous(KErrNone); User::After(500000); // 0.5 seconds CSysMonTestHelper* helper = CSysMonTestHelper::NewLC(); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_startupregeioffailstart1.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_startupregeioffailstart1.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_app_startupregeioffailstart1.cpp Thu Sep 02 21:48:26 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" @@ -20,9 +20,14 @@ */ #include "sysmontesthelper.h" +#include + +const TUint32 KRestartExeCount = 44; LOCAL_C TInt MainL() { + TInt err = RProperty::Define(KTestSysMon, KRestartExeCount, RProperty::EInt); + RDebug::Printf("Defining P&S key with key %d returns with err %d", err, KRestartExeCount); TInt runCount = 0; CCommandLineArguments* args = CCommandLineArguments::NewLC(); runCount = CSysMonTestHelper::ReadRunCountL(args->Arg(0)); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_server.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_server.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_server.cpp Thu Sep 02 21:48:26 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 @@ #include "tsysmon_steploadsysmon.h" #include "tsysmon_stepoomsysmon.h" #include "tsysmon_stepcancelallmonitors.h" +#include "tsysmon_steposrestarttest.h" CSysMonTestServer* CSysMonTestServer::NewLC() { @@ -169,6 +170,14 @@ { testStep = new CStepCancelAllMonitors(); } + else if(aStepName == KCTestCaseCriticalNoRetriesStep) + { + testStep = new CStepOSRestart(KCTestCaseCriticalNoRetries); + } + else if(aStepName == KCTestCaseRestartOSStep) + { + testStep = new CStepOSRestart(KCTestCaseRestartOS); + } else { RDebug::Printf("Unknown sysmon teststep %S", &aStepName); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_server_defs.h --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_server_defs.h Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_server_defs.h Thu Sep 02 21:48:26 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" @@ -32,6 +32,7 @@ _LIT(KTSysMonServerDeregExpectedResult,"DeregExpectedResult"); _LIT(KTSysMonServerExpectedRegisterCount,"ExpectedRegisterCount"); _LIT(KTSysMonServerExpectedRestartCount,"ExpectedRestartCount"); +_LIT(KTSysMonServerProcessArguments,"ProcessArguments"); _LIT(KSpace, " "); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_step_result_check.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_step_result_check.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_step_result_check.cpp Thu Sep 02 21:48:26 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" @@ -36,9 +36,11 @@ TInt expectedResult = 0; TInt expectedRegisterCount = 0; TInt expectedRestartCount = 0; + TInt processArguments = 0; if (!GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedResult, expectedResult) || !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRegisterCount, expectedRegisterCount) || - !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRestartCount, expectedRestartCount)) + !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRestartCount, expectedRestartCount) || + !GetIntFromConfig(ConfigSection(), KTSysMonServerProcessArguments, processArguments)) { ERR_PRINTF1(_L("Error reading ini file data")); User::Leave(KErrNotFound); @@ -48,7 +50,7 @@ TInt actualRegisterCount = 0; TInt actualRestartCount = 0; CSysMonTestHelper::GetResultIntL(ConfigSection(), actualResult); - actualRegisterCount = CSysMonTestHelper::GetRegisterCountL(); + actualRegisterCount = CSysMonTestHelper::GetRegisterCount(processArguments); actualRestartCount = CSysMonTestHelper::GetRestartCountL(); INFO_PRINTF2(_L("Actual result: %d"), actualResult); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_step_run_count_check.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_step_run_count_check.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_step_run_count_check.cpp Thu Sep 02 21:48:26 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" @@ -37,10 +37,12 @@ TInt expectedRunCount = 0; TInt expectedRegisterCount = 0; TInt expectedRestartCount = 0; + TInt processArguments = 0; if (!GetStringFromConfig(ConfigSection(), KTSysMonServerFilename, filename) || !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRunCount, expectedRunCount) || !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRegisterCount, expectedRegisterCount) || - !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRestartCount, expectedRestartCount)) + !GetIntFromConfig(ConfigSection(), KTSysMonServerExpectedRestartCount, expectedRestartCount) || + !GetIntFromConfig(ConfigSection(), KTSysMonServerProcessArguments, processArguments)) { ERR_PRINTF1(_L("Error reading ini file data")); User::Leave(KErrNotFound); @@ -51,7 +53,7 @@ TInt actualRegisterCount = 0; TInt actualRestartCount = 0; actualRunCount = CSysMonTestHelper::ReadRunCountL(filename); - actualRegisterCount = CSysMonTestHelper::GetRegisterCountL(); + actualRegisterCount = CSysMonTestHelper::GetRegisterCount(processArguments); actualRestartCount = CSysMonTestHelper::GetRestartCountL(); INFO_PRINTF2(_L("Actual run count: %d"), actualRunCount); diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steposrestarttest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steposrestarttest.cpp Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,232 @@ +// Copyright (c) 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: +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +#include "testprocgoodsession.h" +#include "tsysmon_steposrestarttest.h" +#include +#include +#include +#include +#include +#include +#include + +_LIT(KSysMonDontRendezvousRunCountFile, "C:\\testdata\\runcounts\\tsysmon_app_dontrendezvous.exe"); + +CStepOSRestart::CStepOSRestart(const TDesC& aTestName): iTestName(aTestName) + { + if (aTestName == KCTestCaseCriticalNoRetries) + SetTestStepName(KCTestCaseCriticalNoRetriesStep); + else if (aTestName == KCTestCaseRestartOS) + SetTestStepName(KCTestCaseRestartOSStep); + else + { + // If the test script is none of the above then we would fail the test + TEST(KErrArgument); + } + } + +CStepOSRestart::~CStepOSRestart() + { + iSsmStateAwareSess.Close(); + if (iAsyncCallbackForStartTest) + delete iAsyncCallbackForStartTest; + if(iAsyncCallbackForStopScheduler) + delete iAsyncCallbackForStopScheduler; + } + +void CStepOSRestart::StateChanged(TSsmState aSsmState) + { + + } +void CStepOSRestart::CallStopSchedulerL() + { + TSsmState currenState; + currenState = iSsmStateAwareSess.State(); + + TUint16 currentMainState = currenState.MainState(); + // Active scheduler is stopped once the system goes into shutdown state, else it issues a request for callback again + // Once the system gets into normal state start the state transition test + if (currentMainState == ESsmFail || currentMainState == ESsmShutdown) + { + RDebug::Print(_L("\nStateTran Test: Stop Active Scheduler\n")); + TInt runCount = CSysMonTestHelper::ReadRunCountL(KSysMonDontRendezvousRunCountFile); + if((iTestName == KCTestCaseCriticalNoRetries) && (1 != runCount)) + SetTestStepResult(EFail); + else if((iTestName == KCTestCaseRestartOS) && (2 != runCount)) + SetTestStepResult(EFail); + CActiveScheduler::Stop(); + } + else + { + iAsyncCallbackForStopScheduler->CallBack(); + } + } + +static TInt StopScheduler(TAny* aStateTranFromNormal) + { + CStepOSRestart* stateTran = reinterpret_cast(aStateTranFromNormal); + TRAPD(err,stateTran->CallStopSchedulerL()); + return err; + } + + +TVerdict CStepOSRestart::doTestStepL() + { + TInt err =0; + if (iTestName == KCTestCaseCriticalNoRetries) + { + TRAP(err, TestCriticalNoRetriesL()); + } + else if (iTestName == KCTestCaseRestartOS) + { + TRAP(err, TestRestartOSL()); + } + TEST(KErrNone == err); + return TestStepResult(); + } + +void CStepOSRestart::TestCriticalNoRetriesL() + { + CActiveScheduler* sched=new(ELeave) CActiveScheduler; + CleanupStack::PushL(sched); + CActiveScheduler::Install(sched); + + RSysMonSession sysmon; + sysmon.OpenL(); + CleanupClosePushL(sysmon); + + CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_dontrendezvous.exe"), KNullDesC); + props->SetMonitored(ETrue); + props->SetStartupType(EStartProcess); + props->SetStartMethod(EWaitForStart); + props->SetNoOfRetries(1); + props->SetTimeout(0); + props->SetRecoveryParams(ECriticalNoRetries, 0); + + RProcess slave1; + slave1.Create(_L("tsysmon_app_dontrendezvous.exe"), _L("5000")); + CleanupClosePushL(slave1); + + TSsmState currenState; + // Connects to RSsmStateAwareSession in order to enquire about the current system state + TInt err = iSsmStateAwareSess.Connect(KSM2UiServicesDomain3); + TEST(err == KErrNone); + if (err == KErrNone) + RDebug::Print(_L("\nStateTran Test: RSsmStateAwareSession sess Connect %d\n"), err); + else + { + RDebug::Print(_L("\nStateTran Test: RSsmStateAwareSession sess Connect Failed\n")); + User::Leave(err); + } + + currenState = iSsmStateAwareSess.State(); + + RDebug::Print(_L("\nStateTran Test: Current System State is %d\n"), currenState.MainState()); + TEST(currenState.MainState() == ESsmNormal); + + iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); + TCallBack stopSchedulerCallback(StopScheduler, this); + iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); + + // call the callback function which keeps looping until the system state gets into fail state. + iAsyncCallbackForStopScheduler->CallBack(); + + // Notifier used to get the notification when system gets to fail state + CSsmStateAwareSession* notif_for_failstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); + notif_for_failstate->AddSubscriberL(*this); + + TRequestStatus status; + slave1.Rendezvous(status); + slave1.Resume(); + User::WaitForRequest(status); + // Register with SysMon + sysmon.MonitorL(*props, slave1); + slave1.Terminate(KErrNone); + + sched->Start(); + + CleanupStack::PopAndDestroy(5); + } + +void CStepOSRestart::TestRestartOSL() + { + CActiveScheduler* sched=new(ELeave) CActiveScheduler; + CleanupStack::PushL(sched); + CActiveScheduler::Install(sched); + + RSysMonSession sysmon; + sysmon.OpenL(); + CleanupClosePushL(sysmon); + + CStartupProperties* props = CStartupProperties::NewLC(_L("tsysmon_app_dontrendezvous.exe"), KNullDesC); + props->SetMonitored(ETrue); + props->SetStartupType(EStartProcess); + props->SetStartMethod(EWaitForStart); + props->SetNoOfRetries(1); + props->SetTimeout(0); + props->SetRecoveryParams(ERestartOS, 0); + + RProcess slave1; + slave1.Create(_L("tsysmon_app_dontrendezvous.exe"), _L("5000")); + CleanupClosePushL(slave1); + + TSsmState currenState; + // Connects to RSsmStateAwareSession in order to enquire about the current system state + TInt err = iSsmStateAwareSess.Connect(KSM2UiServicesDomain3); + TEST(err == KErrNone); + if (err == KErrNone) + RDebug::Print(_L("\nStateTran Test: RSsmStateAwareSession sess Connect %d\n"), err); + else + { + RDebug::Print(_L("\nStateTran Test: RSsmStateAwareSession sess Connect Failed\n")); + User::Leave(err); + } + + currenState = iSsmStateAwareSess.State(); + + RDebug::Print(_L("\nStateTran Test: Current System State is %d\n"), currenState.MainState()); + TEST(currenState.MainState() == ESsmNormal); + + iAsyncCallbackForStopScheduler = new(ELeave) CAsyncCallBack(CActive::EPriorityIdle); + TCallBack stopSchedulerCallback(StopScheduler, this); + iAsyncCallbackForStopScheduler->Set(stopSchedulerCallback); + + // call the callback function which keeps looping until the system state gets into fail state. + iAsyncCallbackForStopScheduler->CallBack(); + + // Notifier used to get the notification when system gets to fail state + CSsmStateAwareSession* notif_for_failstate = CSsmStateAwareSession::NewLC(KSM2UiServicesDomain3); + notif_for_failstate->AddSubscriberL(*this); + + TRequestStatus status; + slave1.Rendezvous(status); + slave1.Resume(); + User::WaitForRequest(status); + // Register with SysMon + sysmon.MonitorL(*props, slave1); + slave1.Terminate(KErrNone); + + sched->Start(); + + CleanupStack::PopAndDestroy(5); + } + diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steposrestarttest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steposrestarttest.h Thu Sep 02 21:48:26 2010 +0300 @@ -0,0 +1,60 @@ +// Copyright (c) 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: +// + +/** + @file + @test + @internalComponent - Internal Symbian test code +*/ + +#ifndef __TSYSMON_STEPCRITICALNORETRIES_H__ +#define __TSYSMON_STEPCRITICALNORETRIES_H__ + +#include "tsysmon_stepbase.h" +#include "sysmontesthelper.h" +#include +#include + +//APPFWK-SYSMON-0004 + +_LIT(KCTestCaseCriticalNoRetries, "CriticalNoRetries"); +_LIT(KCTestCaseRestartOS, "RestartOS"); +_LIT(KCTestCaseCriticalNoRetriesStep, "CriticalNoRetriesStep"); +_LIT(KCTestCaseRestartOSStep, "RestartOSStep"); + +class CStepOSRestart : public CTestStepBase, public MStateChangeNotificationSubscriber + { +public: + CStepOSRestart(const TDesC& aTestName); + void CallStopSchedulerL(); + void StateChanged(TSsmState aSsmState); + ~CStepOSRestart(); + + //from CTestStep + TVerdict doTestStepL(); +protected: + RSsmStateAwareSession iSsmStateAwareSess; + CAsyncCallBack* iAsyncCallbackForStartTest; + CAsyncCallBack* iAsyncCallbackForStopScheduler; + +private: + void TestCriticalNoRetriesL(); + void TestRestartOSL(); + +private: + const TDesC& iTestName; + }; + +#endif diff -r 072a9626b290 -r 09d657f1ee00 systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steprestartthrottle.cpp --- a/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steprestartthrottle.cpp Wed Aug 18 11:03:14 2010 +0300 +++ b/systemhealthmanagement/systemhealthmgr/test/tsysmon/src/tsysmon_steprestartthrottle.cpp Thu Sep 02 21:48:26 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" @@ -71,6 +71,16 @@ void CStepRestartThrottle::DoTestMonitor() { + TInt millisecs1 =0; + TDateTime datetime; + TTime time; + time.HomeTime(); + datetime = time.DateTime(); + millisecs1 = (datetime.MicroSecond() / 1000) + + (datetime.Second() * 1000) + + (datetime.Minute() * 60 * 1000) + + (datetime.Hour() * 60 * 60 * 1000); + //Sleep 14 seconds and then assert that the server is not yet restarted INFO_PRINTF1(_L("Going to sleep for 14 seconds.")); User::After(KThrottleTime - 1000000); @@ -91,11 +101,22 @@ INFO_PRINTF1(_L("Waiting till the process is restarted using semaphore.")); //Wait for the process to be restarted iProcStartSignalSem.Wait(); + + time.HomeTime(); + datetime = time.DateTime(); + TInt millisecs2 = 0; + millisecs2 = (datetime.MicroSecond() / 1000) + + (datetime.Second() * 1000) + + (datetime.Minute() * 60 * 1000) + + (datetime.Hour() * 60 * 60 * 1000); //Assert that the server is running INFO_PRINTF1(_L("Woke up, now the server should be restarted (sysmon KWaitTime is 15s).")); err = server.Connect(); TESTE(KErrNone == err, err); + INFO_PRINTF2(_L("Server restarted after %d ms"), (millisecs2 - millisecs1)); + //Testing whether the server restarted after the throttle time, which is 15s + TEST((millisecs2 - millisecs1) >= 15000); if(KErrNone == err) { INFO_PRINTF1(_L("Yes, asserted that server is running, going to cancel monitoring shutdown server"));