# HG changeset patch # User andy simpson # Date 1284736486 -3600 # Node ID a2ddb8b15745be2edcedd528ea7aec307dfe255e # Parent 75184094ace1f10701160a4649b57a1671200ec2# Parent 9af619316cbfd8ee2f929020e99d07e607dee924 Merge re-apply fixes for Bug 2524, Bug 2414 (Symbian splashscreen and shutdown) diff -r 75184094ace1 -r a2ddb8b15745 appsupport_plat/context_framework_services_api/inc/CFActionIndication.h --- a/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Thu Sep 02 15:49:18 2010 +0100 +++ b/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2007 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 @@ #define C_CFACTIONINDICATION_H #include -#include +#include /** * Encapsulates inside an action indication. Action indication consists of diff -r 75184094ace1 -r a2ddb8b15745 contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h --- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Thu Sep 02 15:49:18 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Fri Sep 17 16:14:46 2010 +0100 @@ -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" @@ -23,7 +23,7 @@ #include #include #include -#include +#include // INTERNAL INCLUDES diff -r 75184094ace1 -r a2ddb8b15745 contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h --- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Thu Sep 02 15:49:18 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Fri Sep 17 16:14:46 2010 +0100 @@ -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" @@ -23,7 +23,7 @@ #include #include -#include +#include // INTERNAL INCLUDES diff -r 75184094ace1 -r a2ddb8b15745 contextframework/cfw/tsrc/public/basic/common/cffakeenv.h --- a/contextframework/cfw/tsrc/public/basic/common/cffakeenv.h Thu Sep 02 15:49:18 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/common/cffakeenv.h Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2008 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,7 +24,7 @@ #include #include -#include +#include #include "cfextendedcontextinterface.h" #include "CFScriptEngineInterface.h" diff -r 75184094ace1 -r a2ddb8b15745 contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp --- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -30,7 +30,7 @@ #include "cfcontextobjectimpl.h" #include "CFContextQueryImpl.h" #include "CFContextSubscriptionImpl.h" -#include "CFKeyValuePair.h" +#include "cfkeyvaluepair.h" #include "cfserviceutils.h" #include "cfcontextdataproxy.h" #include "cfenvutils.h" diff -r 75184094ace1 -r a2ddb8b15745 coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp --- a/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -17,9 +17,9 @@ */ // INCLUDE FILES -#include "GSLogger.h" +#include "GsLogger.h" #include "GSServerEngine.h" -#include +#include #include #include diff -r 75184094ace1 -r a2ddb8b15745 coreapplicationuis/SysAp/Group/SysAp.mmp --- a/coreapplicationuis/SysAp/Group/SysAp.mmp Thu Sep 02 15:49:18 2010 +0100 +++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Fri Sep 17 16:14:46 2010 +0100 @@ -147,8 +147,8 @@ SOURCE powersavemode/sysappsmcontroller.cpp SOURCE sysapbatteryinfocontroller.cpp -SOURCE gan\sysapganpropertylistener.cpp -SOURCE gan\sysapganhandler.cpp +SOURCE gan/sysapganpropertylistener.cpp +SOURCE gan/sysapganhandler.cpp SOURCE SysApSatObserver.cpp LIBRARY satclient.lib // for sat refresh diff -r 75184094ace1 -r a2ddb8b15745 coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h --- a/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Thu Sep 02 15:49:18 2010 +0100 +++ b/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Fri Sep 17 16:14:46 2010 +0100 @@ -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" @@ -28,7 +28,7 @@ #include #include #include // Remove this when SecondaryDisplayStartupAPI.h includes it properly. -#include +#include #include "SysApAppUi.h" diff -r 75184094ace1 -r a2ddb8b15745 coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -762,16 +762,14 @@ TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): Reading value of KStartupSecurityCodeQueryStatus - State Value: %d"),securityQueryState)); TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ); //Disable keylock if Alarm is active or if a Security code query is active on the display - if ( alarmState == ECoreAppUIsDisableKeyguard || securityQueryState == ESecurityQueryActive ) + if ( alarmState == ECoreAppUIsDisableKeyguard || securityQueryState == ESecurityQueryActive + || callState == EPSCTsyCallStateRinging || iDeviceLockEnabled) { KeyLock().DisableWithoutNote(); } else { - if( callState != EPSCTsyCallStateConnected && !iDeviceLockEnabled) - { - KeyLock().EnableWithoutNote(); - } + KeyLock().EnableWithoutNote(); } } else diff -r 75184094ace1 -r a2ddb8b15745 coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp --- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2007 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" @@ -22,7 +22,7 @@ #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION #include -#include +#include #include #include "SysApShutdownAnimation.h" diff -r 75184094ace1 -r a2ddb8b15745 coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp --- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -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" @@ -221,7 +221,7 @@ API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read default enhancement string" ); defaultText = iCoeEnv->AllocReadResourceLC( R_TEXT_DEFAULT_ENHANC ); - TPtrC enhancement; + HBufC* enhancement=NULL; TBool enhancementOk( ETrue ); if ( value != 0 ) @@ -230,6 +230,7 @@ enhancementOk = EFalse; HBufC8* literals = iCoeEnv->AllocReadResourceAsDes8L( R_SELECTION_DIALOG_LITERALS ); + CleanupStack::PushL(literals); TResourceReader reader; reader.SetBuffer( literals ); @@ -247,7 +248,7 @@ { API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Literal found!" ); // Literal found - enhancement.Set( reader.ReadTPtrC() ); + enhancement=reader.ReadTPtrC().AllocL(); enhancementOk = ETrue; break; } @@ -258,7 +259,8 @@ } } - delete literals; + CleanupStack::PopAndDestroy(literals); + CleanupStack::PushL(enhancement); } if ( enhancementOk ) @@ -275,12 +277,12 @@ if ( value != 0 ) { API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Show also default information!" ); - noteStr = HBufC::NewL( defaultText->Length() + enhancement.Length() + 3 ); + noteStr = HBufC::NewL( defaultText->Length() + enhancement->Length() + 3 ); TPtr ptr( noteStr->Des() ); ptr.Append( defaultText->Des() ); ptr.Append( ' ' ); - ptr.Append( enhancement ); + ptr.Append( *enhancement ); API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default string ready!" ); } @@ -325,15 +327,16 @@ { API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Create default accessory text!" ); //only default accessory text - noteStr = HBufC::NewL( defaultText->Length() + enhancement.Length() + 1 ); + noteStr = HBufC::NewL( defaultText->Length() + enhancement->Length() + 1 ); TPtr ptr( noteStr->Des() ); ptr.Append( defaultText->Des() ); ptr.Append( ' ' ); - ptr.Append( enhancement ); + ptr.Append( *enhancement ); API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default accessory text ready!" ); } + CleanupStack::PopAndDestroy(enhancement); // Pass string to member string and free local copies CleanupStack::PopAndDestroy( defaultText ); CleanupStack::PushL( noteStr ); diff -r 75184094ace1 -r a2ddb8b15745 startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h --- a/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Thu Sep 02 15:49:18 2010 +0100 +++ b/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-10 Nokia Corporation and/or 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,7 +23,7 @@ #include #include #include -#include +#include // FORWARD DECLARATIONS diff -r 75184094ace1 -r a2ddb8b15745 startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp --- a/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -22,7 +22,7 @@ // SYSTEM INCLUDES #include #include -#include +#include #include #include diff -r 75184094ace1 -r a2ddb8b15745 startupservices/Startup/inc/StartupAppUi.h --- a/startupservices/Startup/inc/StartupAppUi.h Thu Sep 02 15:49:18 2010 +0100 +++ b/startupservices/Startup/inc/StartupAppUi.h Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 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" @@ -36,9 +36,9 @@ #include #ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - #include + #include #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -#include +#include // USER INCLUDES diff -r 75184094ace1 -r a2ddb8b15745 startupservices/Startup/syserrcmd/src/syserrcmd.cpp --- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-10 Nokia Corporation and/or 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,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff -r 75184094ace1 -r a2ddb8b15745 startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp --- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -24,7 +24,7 @@ #include #include #include "sanimengine.h" -#include +#include #include "sanimstartupctrl.h" #include "trace.h" diff -r 75184094ace1 -r a2ddb8b15745 sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp --- a/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -193,13 +193,17 @@ { RProcess processName; err = clientThread.Process(processName); - dataPaged = processName.DefaultDataPaged(); + if(err == KErrNone) + { + dataPaged = processName.DefaultDataPaged(); + processName.Close(); + } + clientThread.Close(); } else { OomMonitorPanic(KInvalidClientRequestType); - } - + } switch (request->iClientRequestType) { diff -r 75184094ace1 -r a2ddb8b15745 sysresmonitoring/oommonitor/src/oomcloseapp.cpp --- a/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -62,12 +62,17 @@ if (err == KErrNone) { RProcess process; - thread.Process(process); - TBool isDataPaged = process.DefaultDataPaged(); - if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged )) + err = thread.Process(process); + if(err == KErrNone) { - iCurrentTask.EndTask(); + TBool isDataPaged = process.DefaultDataPaged(); + if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged )) + { + iCurrentTask.EndTask(); + } + process.Close(); } + thread.Close(); } } diff -r 75184094ace1 -r a2ddb8b15745 sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp --- a/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Thu Sep 02 15:49:18 2010 +0100 +++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Fri Sep 17 16:14:46 2010 +0100 @@ -73,9 +73,12 @@ if(err == KErrNone) { dataPaged = processName.DefaultDataPaged(); + processName.Close(); + clientThread.Close(); } else { + clientThread.Close(); PanicClient(aMessage, EPanicIllegalFunction); } }