--- 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 <e32base.h>
-#include <CFKeyValuePair.h>
+#include <cfkeyvaluepair.h>
/**
* Encapsulates inside an action indication. Action indication consists of
--- 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 <CEUnitTestSuiteClass.h>
#include <EUnitDecorators.h>
#include <f32file.h>
-#include <CFKeyValuePair.h>
+#include <cfkeyvaluepair.h>
// INTERNAL INCLUDES
--- 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 <CEUnitTestSuiteClass.h>
#include <f32file.h>
-#include <CFKeyValuePair.h>
+#include <cfkeyvaluepair.h>
// INTERNAL INCLUDES
--- 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 <e32base.h>
#include <f32file.h>
-#include <CFKeyValuePair.h>
+#include <cfkeyvaluepair.h>
#include "cfextendedcontextinterface.h"
#include "CFScriptEngineInterface.h"
--- 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"
--- 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 <AccessoriesCRKeys.h>
+#include <accessoriescrkeys.h>
#include <e32svr.h>
#include <centralrepository.h>
--- 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
--- 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 <MediatorCommandResponder.h>
#include <MediatorEventProvider.h>
#include <w32std.h> // Remove this when SecondaryDisplayStartupAPI.h includes it properly.
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include "SysApAppUi.h"
--- 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
--- 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 <aknappui.h>
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include <startupdomaincrkeys.h>
#include "SysApShutdownAnimation.h"
--- 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 );
--- 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 <MediatorCommandResponder.h>
#include <MediatorPluginBase.h>
#include <MediatorEventProvider.h>
-#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
// FORWARD DECLARATIONS
--- 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 <MediatorDomainUIDs.h>
#include <startupdomainpskeys.h>
-#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
#include <avkondomainpskeys.h>
#include <coreapplicationuisdomainpskeys.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 <data_caging_path_literals.hrh>
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
+ #include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
// USER INCLUDES
--- 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 <aknSDData.h>
#include <data_caging_path_literals.hrh>
#include <featmgr.h>
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include <StringLoader.h>
#include <startup.rsg>
#include <stringresourcereader.h>
--- 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 <Profile.hrh>
#include <ProfileEngineSDKCRKeys.h>
#include "sanimengine.h"
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include "sanimstartupctrl.h"
#include "trace.h"
--- 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)
{
--- 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();
}
}
--- 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);
}
}