--- a/appfw/apparchitecture/aplist/aplapplist.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplist.cpp Wed Oct 13 14:43:04 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"
@@ -943,7 +943,7 @@
*/
EXPORT_C void CApaAppList::AddForcedRegistrationL(const TDesC& aRegistrationFile)
{
- TInt err = iForcedRegistrations->InsertIsqL(aRegistrationFile, ECmpFolded);
+ TRAPD(err, iForcedRegistrations->InsertIsqL(aRegistrationFile, ECmpFolded));
if (err != KErrAlreadyExists) // We silently ignore attempts to insert duplicates
User::LeaveIfError(err);
--- a/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Wed Sep 15 12:23:15 2010 +0300
+++ b/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2007 Nokia Corporation and/or 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/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Wed Sep 15 12:23:15 2010 +0300
+++ b/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -78,16 +78,6 @@
* between low and good memory states.
*/
virtual void MemoryGood() = 0;
-
- /**
- * Function: AppId
- * The function return the UID3 of the process which implements the plugin
- * By default, the Null UID [KNullUid] is returned.
- * The plugin can override this API with their own implementation.
- * COomMonitorPlugin monitor plugins
- * @return the UID3 the application which implements the plugin
- */
- virtual const TUid AppId() const;
public:
/**
@@ -184,16 +174,6 @@
public:
IMPORT_C static CAppOomMonitorPlugin* NewL(TUid aAppUid);
- /**
- * Function: AppId
- * The function return the UID3 of the process which implements the plugin
- * By default, the Null UID [KNullUid] is returned.
- * The plugin can override this API with their own implementation.
- * COomMonitorPlugin monitor plugins
- * @return the UID3 the application which implements the plugin
- */
- const TUid AppId() const;
-
private:
CAppOomMonitorPlugin(TUid aAppUid);
--- a/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h Wed Sep 15 12:23:15 2010 +0300
+++ b/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -263,14 +263,6 @@
*/
const TUint32 KStartupDefaultTime = 0x00000016;
-/**
-* AT command CFun specifc key
-* Default value is 0
-* Offline to Online profile transition value is 1
-* Online to Offline profile transition value is 2
-*/
-const TUint32 KStartupATcmdCFUNProfileChange = 0x0000001A;
-
#endif // STARTUPDOMAINCRKEYS_H
// End of File
--- a/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h Wed Sep 15 12:23:15 2010 +0300
+++ b/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -332,31 +332,4 @@
ECoreAppUIsProfileActivatedNoteShown = 1
};
-
-
-// =============================================================================
-// GAN Mode API
-// =============================================================================
-
-// Use TUid KPSUidCoreApplicationUIs = { 0x101F8767 }
-
-const TUint32 KCoreAppUIsGanPropertyGanMode = 0x00000601;
-
-/** GANmode (actual network mode) */
-enum TCoreAppUIsGanMode
- {
- EGanModeUnspecified = 0, // We are not aware of MS GAN/GERAN state
- EGanModeGAN = 1, // MS is in GAN
- EGanModeGeran = 2 // MS is in GERAN
- };
-
-
-// =============================================================================
-// GAN Signal strength
-// =============================================================================
-
-// Use TUid KPSUidCoreApplicationUIs = { 0x101F8767 }
-
-const TUint32 KCoreAppUIsGanPropertySignalLevel = 0x00000602;
-
#endif // COREAPPLICATIONUISDOMAINPSKEYS_H
--- a/contextframework/cfw/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -32,9 +32,9 @@
../conf/contextframework_10282BCE.crml MW_LAYER_CRML(contextframework_10282BCE.crml)
../conf/contextframework_200159ED.crml MW_LAYER_CRML(contextframework_200159ED.crml)
-../data/backup_registration.xml /epoc32/data/z/private/10282BC4/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10282BC4/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10282BC4/backup_registration.xml
+../data/backup_registration.xml /epoc32/data/Z/private/10282BC4/backup_registration.xml
+../data/backup_registration.xml /epoc32/release/winscw/UDEB/Z/private/10282BC4/backup_registration.xml
+../data/backup_registration.xml /epoc32/release/winscw/UREL/Z/private/10282BC4/backup_registration.xml
#ifdef RD_CONTEXT_FRAMEWORK
../rom/ContextFramework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ContextFramework.iby)
--- a/contextframework/cfw/src/cfclient/cfcontextservice.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/src/cfclient/cfcontextservice.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -291,7 +291,7 @@
TInt err = KErrNone;
// Stream context query set into buffer
- HBufC8* buffer = WriteStreamContextQueryLC( aContextQuery );
+ HBufC8* buffer = buffer = WriteStreamContextQueryLC( aContextQuery );
HBufC8* resultBuffer = HBufC8::NewLC( iRequestBufferSize );
TPtr8 resultBufferPtr = resultBuffer->Des();
TPckg<TInt> bufferSizePtr( iRequestBufferSize );
--- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
--- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
--- a/contextframework/cfw/tsrc/public/basic/common/cffakeenv.h Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/common/cffakeenv.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 Nokia Corporation and/or 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/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -39,7 +39,7 @@
../data/testsettings/10282BDA.txt\
/epoc32/data/z/private/10202be9/10282BDA.txt
../data/testsettings/10282BDA.txt\
- /epoc32/release/winscw/udeb/z/private/10202be9/10282BDA.txt
+ /epoc32/release/winscw/udeb/Z/private/10202be9/10282BDA.txt
../data/testsettings/testcontextsourcesetting1.xml\
/epoc32/data/z/private/10282BC4/Settings/10002001/testcontextsourcesetting1.xml
--- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -247,7 +247,7 @@
TInt psValue;
TLex lex( psValueDesc );
- User::LeaveIfError( lex.Val(psValue) );
+ lex.Val(psValue);
intmapper->AddMappingL(psValue, contextValue);
}
--- a/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp Wed Oct 13 14:43:04 2010 +0300
@@ -50,7 +50,7 @@
LIBRARY cfactivatorengine.lib
LIBRARY cfservices.lib
LIBRARY centralrepository.lib
-LIBRARY avkon.lib
+LIBRARY Avkon.lib
LIBRARY apgrfx.lib
#ifdef TRACE_INTO_FILE
LIBRARY flogger.lib
--- a/contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2006 Nokia Corporation and/or 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,6 +84,7 @@
CCFActionPlugIn::TExecutionTime time = CCFActionPlugIn::ENone;
+ const RKeyValueArray& params = aActionIndication->Parameters();
// Check for action ID: Orientation
if( aActionIndication->Identifier().CompareF(
KOrientationAction ) == KErrNone )
--- a/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2006-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"
@@ -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/Rfs/Plugins/GSRFSPlugin/data/GSRFSPluginRsc.rss Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/GSRFSPluginRsc.rss Wed Oct 13 14:43:04 2010 +0300
@@ -24,7 +24,7 @@
#include <avkon.rsg>
#include <avkon.mbg>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <eikon.rsg>
#include <avkon.loc>
#include "gsrfsplugin.hrh"
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp Wed Oct 13 14:43:04 2010 +0300
@@ -71,7 +71,7 @@
LIBRARY CommonEngine.lib
LIBRARY fbscli.lib
LIBRARY AknIcon.lib
-LIBRARY AKNSKINS.lib
+LIBRARY aknskins.lib
LIBRARY hlplch.lib
LIBRARY GSFramework.lib
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -25,7 +25,7 @@
../rom/rfscustcmdtest.iby CORE_OS_LAYER_IBY_EXPORT_PATH( rfscustcmdtest.iby )
../data/excludelist.txt /epoc32/release/winscw/udeb/z/private/100059C9/excludelist.txt
../data/excludelist.txt /epoc32/release/winscw/urel/z/private/100059C9/excludelist.txt
-../data/excludelist.txt /epoc32/data/z/private/100059C9/excludelist.txt
+../data/excludelist.txt /epoc32/data/Z/private/100059C9/excludelist.txt
// Export file for emulator. For HW file come from pkg
../init/rfscustcmdtest.ini /epoc32/winscw/c/testframework/rfscustcmdtest.ini
--- a/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Wed Oct 13 14:43:04 2010 +0300
@@ -26,7 +26,7 @@
#include <pdpcontextmanagerpskeys.h>
#include <sipsystemstatemonitorpskeys.h>
-#include "rfsConTimer.h"
+#include "rfscontimer.h"
class CRfsConTimer;
--- a/coreapplicationuis/Rfs/src/rfscontimer.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfscontimer.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -17,7 +17,7 @@
*/
-#include "rfsConTimer.h"
+#include "rfscontimer.h"
#include "RfsTraces.h"
const TInt KRfsConnectionTimeOut = 60000000;
--- a/coreapplicationuis/SysAp/Data/SysAp.rss Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Data/SysAp.rss Wed Oct 13 14:43:04 2010 +0300
@@ -21,7 +21,7 @@
// INCLUDES
#include <eikon.rh>
-#include <SysAp.loc>
+#include <sysap.loc>
#include <avkon.loc>
#include <avkon.rsg>
#include <AiwCommon.rh>
--- a/coreapplicationuis/SysAp/Group/SysAp.mmp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Wed Oct 13 14:43:04 2010 +0300
@@ -147,9 +147,6 @@
SOURCE powersavemode/sysappsmcontroller.cpp
SOURCE sysapbatteryinfocontroller.cpp
-SOURCE gan/sysapganpropertylistener.cpp
-SOURCE gan/sysapganhandler.cpp
-
SOURCE SysApSatObserver.cpp
LIBRARY satclient.lib // for sat refresh
@@ -184,8 +181,6 @@
USERINCLUDE ../CenRep
USERINCLUDE ../PubSub
-USERINCLUDE ../src/gan
-
APP_LAYER_SYSTEMINCLUDE // used instead of MW_LAYER_SYSTEMINCLUDE due to dependencies to APP layer
LIBRARY euser.lib
--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Wed Oct 13 14:43:04 2010 +0300
@@ -98,8 +98,6 @@
class CSysApDriveUnlockHandler;
class CSysApDriveEjectHandler;
-class CSysApGanHandler;
-
class CSysApBatteryInfoController;
//CONSTANTS
@@ -738,13 +736,6 @@
void SetSignalIndicatorWcdmaL();
/**
- * Gets called by SetSignalIndicatorL() when in Gan network
- * @param None
- * @return void
- */
- void SetSignalIndicatorGanL();
-
- /**
* Handles GPRS suspend/resume notes if feature supported.
* ie. Gprs state icon or common signal icon.
* @param None
@@ -1439,7 +1430,7 @@
* @since S60 3.2
* @return reference to CSysApCenRepLogsObserver object
*/
- CSysApCenRepLogsObserver& LogsObserverL();
+ CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL();
/**
* Adds MMC removal item(s) to power menu.
@@ -1701,12 +1692,6 @@
//Flag to record if the TD network is enalbed.
TBool iTDEnable;
TBool IsDefaultPowerKeyBehavior();
-
- // Are we in GAN mode
- TBool iGanEnabled;
-
- // Handler for GAN events
- CSysApGanHandler* iSysApGanHandler;
};
--- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -185,7 +185,7 @@
* @since S60 9.2
* @return ETrue if feature is set
*/
- TBool SlideSupported() const;
+ TBool CSysApFeatureManager::SlideSupported() const;
/**
* Returns whether Cover Display is supported.
@@ -264,14 +264,6 @@
*/
TBool PowerKeyIsLockKey() const;
- /**
- * Returns whether GAN is supported.
- *
- * @since S60 3.2
- * @return ETrue if feature is supported
- */
- TBool GanSupported() const;
-
private:
/**
@@ -397,12 +389,6 @@
* Short press of power key invokes keylock
*/
TBool iPowerKeyIsLockKey;
-
- /**
- * Generic Access Network (GAN) supported status.
- */
- TBool iGanSupported;
-
};
#endif // SYSAPFEATUREMANAGER_H
--- a/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
--- a/coreapplicationuis/SysAp/Inc/sysapremconobserver.h Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapremconobserver.h Wed Oct 13 14:43:04 2010 +0300
@@ -58,7 +58,7 @@
/**
* Open remcon interface and reserve the volume keys
*/
- void StartRemconInterfaceL();
+ void StartRemconInterface();
/**
* close the remcon interface and release the volume keys
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 Nokia Corporation and/or 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 @@
KLogsNewMissedCalls );
iNewMissedCallsHandler->StartListeningL();
- User::LeaveIfError(iSession->Get(KLogsNewMissedCalls, iMissedCallsValue));
+ iSession->Get(KLogsNewMissedCalls, iMissedCallsValue);
}
// ----------------------------------------------------------------------------
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -59,7 +59,6 @@
#include <secui.h>
#include <settingsinternalcrkeys.h>
-#include "sysapganhandler.h"
#include <AknNotifierController.h>
#include <eikappui.h>
#include <es_enum.h>
@@ -68,7 +67,7 @@
#include "SysApSimChanged.h"
-#include <sysap.rsg>
+#include <SysAp.rsg>
#include "SysApLightsController.h"
#include "SysApPubSubObserver.h"
@@ -248,8 +247,7 @@
iSysApAudioRoutingObserver( NULL ),
iSysApCenRepCallForwardingObserver( NULL ),
iSysApCenRepMsgWaitingObserver( NULL ),
- iSysApGanHandler( NULL ),
- iKeyBoardRepeatCount(-1)
+ iKeyBoardRepeatCount(-1)
{
TRACES( RDebug::Print( _L("CSysApAppUi::CSysApAppUi()") ) );
}
@@ -490,17 +488,8 @@
TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL trying CSysApCenRepHacSettingObserver::NewL") ) );
iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this );
-
+ DeactivatePSMifBatteryNotLowL ();
- if( iSysApFeatureManager->GanSupported() )
- {
-
-
- RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertyGanMode, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
- RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertySignalLevel, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
- iSysApGanHandler = CSysApGanHandler::NewL( *this );
- }
-
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );
}
@@ -581,8 +570,6 @@
delete iSysApStartupController;
- delete iSysApGanHandler;
-
#ifdef RD_MULTIPLE_DRIVE
iInsertedMemoryCards.Close();
delete iSysApDriveEjectHandler;
@@ -762,14 +749,16 @@
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
- || callState == EPSCTsyCallStateRinging || iDeviceLockEnabled)
+ if ( alarmState == ECoreAppUIsDisableKeyguard || securityQueryState == ESecurityQueryActive )
{
KeyLock().DisableWithoutNote();
}
else
{
- KeyLock().EnableWithoutNote();
+ if( callState != EPSCTsyCallStateConnected && !iDeviceLockEnabled)
+ {
+ KeyLock().EnableWithoutNote();
+ }
}
}
else
@@ -1903,11 +1892,8 @@
void CSysApAppUi::UpdateSignalBarsL( const TInt aState )
{
TRACES( RDebug::Print( _L("CSysApAppUi::UpdateSignalBarsL aState: %d"), aState ) );
- if( iSysApGanHandler && iSysApGanHandler->IsInGanMode() )
- {
- iSignalNotify->SetSignalLevelL( iSysApGanHandler->GanSignalLevel() );
- }
- else if( aState == KAknSignalOffLineMode || (iSysApOfflineModeController->OfflineModeActive() && !iEmergencyCallActive) )
+
+ if( aState == KAknSignalOffLineMode || (iSysApOfflineModeController->OfflineModeActive() && !iEmergencyCallActive) )
{
iSignalNotify->SetSignalLevelL( KAknSignalOffLineMode );
}
@@ -1960,39 +1946,22 @@
}
iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff);
- TRACES( RDebug::Print(_L("CSysApAppUi::SetSignalIndicatorL: gan off" ) ) );
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorOff );
}
else
{
- if( iSysApGanHandler && iSysApGanHandler->IsInGanMode() )
- {
- // Enter GAN: set GAN signal bar
- SetSignalIndicatorGanL();
- iGanEnabled = ETrue;
- }
- else
- {
- if( iGanEnabled )
- {
- UpdateSignalBarsL();
- iGanEnabled = EFalse;
- }
-
- // The device is in Online Mode
- switch ( networkMode )
- {
- case ESysApGSM:
- SetSignalIndicatorGsmL();
- break;
-
- case ESysApWCDMA:
- SetSignalIndicatorWcdmaL();
- break;
-
- default:
- break;
- }
+ // The device is in Online Mode
+ switch ( networkMode )
+ {
+ case ESysApGSM:
+ SetSignalIndicatorGsmL();
+ break;
+
+ case ESysApWCDMA:
+ SetSignalIndicatorWcdmaL();
+ break;
+
+ default:
+ break;
}
}
}
@@ -2244,47 +2213,6 @@
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorGanL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetSignalIndicatorGanL()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::SetSignalIndicatorGanL: available" ) ) );
-
- TInt gprsStatus( 0 );
- gprsStatus = StateOfProperty( KUidSystemCategory, KPSUidGprsStatusValue );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGanL gprsStatus: %d" ), gprsStatus ) );
-
- switch ( gprsStatus )
- {
- case EPSGprsContextActive:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorContext );
- break;
-
- case EPSGprsContextActivating:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorEstablishingContext );
- break;
-
- case EPSGprsSuspend:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorSuspended );
- break;
-
- case EPSGprsAttach:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorAttached );
- break;
-
- case EPSGprsMultibleContextActive:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorMultipdp );
- break;
-
- case EPSGprsUnattached:
- default:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorAvailable );
- break;
- }
- }
-
-// ----------------------------------------------------------------------------
// CSysApAppUi::HandleGprsNotesL()
// ----------------------------------------------------------------------------
@@ -4558,7 +4486,6 @@
InitializeStatusPaneAreaL();
CheckSilentModeL();
HandleAccessoryProfileInStartupL();
- DeactivatePSMifBatteryNotLowL ();
if ( iSysApFeatureManager->MmcSupported() )
{
@@ -6855,7 +6782,8 @@
else // default low warning note must be shown
{
// activate partial power save mode on first low warning
- iSysApPsmController->DoEnablePartialPsm( ETrue ); // activated on first warning note
+ // Enabling Partial Psm automatically disabled
+ //iSysApPsmController->DoEnablePartialPsm( ETrue ); // activated on first warning note
//Display Battery Low note.
ShowUiNoteL( EBatteryLowNote );
}
@@ -6938,10 +6866,15 @@
{
iSysApPsmController->DoEnableFullPsm( ETrue );
}
+
+ // Enabling Partial Psm when the user selects 'No' is diabled.
+ /*
else
{
- iSysApPsmController->DoEnablePartialPsm( ETrue );
- }
+ //iSysApPsmController->DoEnablePartialPsm( ETrue ); // bhaskar
+ }
+ */
+
}
// ----------------------------------------------------------------------------
--- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -114,9 +114,6 @@
iPowerKeyIsLockKey = FeatureManager::FeatureSupported( KFeatureIdFfPowerKeyAsKeyguard );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Power Key as keyguard supported=%d"), iPowerKeyIsLockKey ) );
-
- iGanSupported = FeatureManager::FeatureSupported( KFeatureIdFfGenericAccessNetwork );
- TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: GAN supported=%d"), iGanSupported ) );
CRepository* repository = NULL;
@@ -195,8 +192,8 @@
iVmbxCallDivertIconSupported( EFalse ),
iTouchUnlockStrokeSupported( EFalse ),
iFmTxRdsTextSupported( EFalse ),
- iPowerKeyIsLockKey ( EFalse ),
- iGanSupported( EFalse )
+ iPowerKeyIsLockKey ( EFalse )
+
{
}
@@ -444,15 +441,6 @@
return iPowerKeyIsLockKey;
}
-// ----------------------------------------------------------------------------
-// CSysApFeatureManager::GanSupported()
-// ----------------------------------------------------------------------------
-//
-TBool CSysApFeatureManager::GanSupported() const
- {
- return iGanSupported;
- }
-
// End of File
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -718,7 +718,7 @@
if(iFmTxRemConObserver)
{
//Open Remcon and reserve the volume keys
- iFmTxRemConObserver->StartRemconInterfaceL();
+ iFmTxRemConObserver->StartRemconInterface();
}
}
else
--- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -172,6 +172,13 @@
else if ( iState == EPlaying )
{
iState = EFinished;
+ if ( iCtrl )
+ {
+ iCtrl->Cancel();
+ iView.RemoveComponent();
+ delete iCtrl;
+ iCtrl = NULL;
+ }
iCallBack.CallBack();
}
--- a/coreapplicationuis/SysAp/Src/gan/msysapganpropertyobserver.h Wed Sep 15 12:23:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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: MSysApGanPropertyObserver class definition. This is a callback
-* interface from RProperty listener to client application.
-*
-*/
-
-#ifndef MSYSAPGANPROPERTYOBSERVER_H_
-#define MSYSAPGANPROPERTYOBSERVER_H_
-
-class CSysApGanPropertyListener;
-
-NONSHARABLE_CLASS( MSysApGanPropertyObserver )
- {
-public:
- /**
- * Method is called when property value changes.
- * @param aPropertyListener Listener of the changed property.
- * @param aStatus Status of the event.
- */
- virtual void PropertyEvent(
- CSysApGanPropertyListener& aPropertyListener,
- TInt aStatus ) = 0;
- };
-
-#endif /* MSYSAPGANPROPERTYOBSERVER_H_ */
--- a/coreapplicationuis/SysAp/Src/gan/sysapganhandler.cpp Wed Sep 15 12:23:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +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: Handle GAN server events
-*
-*/
-
-#include <e32base.h>
-#include "coreapplicationuisdomainpskeys.h"
-#include "sysapganhandler.h"
-#include "SysApAppUi.h"
-#include "SysAp.hrh"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ constructor
-// ---------------------------------------------------------------------------
-//
-CSysApGanHandler::CSysApGanHandler( CSysApAppUi& aSysApAppUi ) :
- iSysApAppUi( aSysApAppUi ),
- iGanMode( EGanModeUnspecified )
- {
- }
-
-// ---------------------------------------------------------------------------
-// Symbian 2nd phase constructor
-// ---------------------------------------------------------------------------
-//
-void CSysApGanHandler::ConstructL()
- {
- TRACES( RDebug::Print( _L("CSysApGanHandler::ConstructL IN") ) );
- TInt err( KErrNone );
-
- // Start listening for GAN mode
- err = iPropertyGanMode.Attach( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertyGanMode );
- User::LeaveIfError( err );
- iGanModeListener = CSysApGanPropertyListener::NewL( iPropertyGanMode, *this );
- iGanModeListener->Subscribe();
-
- // Start listening for signal strength
- err = iPropertySignalLevel.Attach( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertySignalLevel );
- User::LeaveIfError( err );
- iSignalLevelListener = CSysApGanPropertyListener::NewL( iPropertySignalLevel, *this );
- iSignalLevelListener->Subscribe();
-
- // Get current GAN mode
- TInt mode;
- err = iPropertyGanMode.Get( mode );
- if( KErrNone == err )
- {
- iGanMode = (TCoreAppUIsGanMode)mode;
- }
-
- // Get current GAN signal level
- iPropertySignalLevel.Get( iGanSignalLevel );
-
- TRACES( RDebug::Print( _L("CSysApGanHandler::ConstructL OUT") ) );
- }
-
-// ---------------------------------------------------------------------------
-// Static constructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanHandler* CSysApGanHandler::NewL( CSysApAppUi& aSysApAppUi )
- {
- CSysApGanHandler* self = new (ELeave) CSysApGanHandler( aSysApAppUi );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanHandler::~CSysApGanHandler()
- {
- delete iGanModeListener;
- delete iSignalLevelListener;
- iPropertyGanMode.Close();
- iPropertySignalLevel.Close();
- }
-
-TBool CSysApGanHandler::IsInGanMode()
- {
- return iGanMode == EGanModeGAN;
- }
-
-TInt CSysApGanHandler::GanSignalLevel()
- {
- return iGanSignalLevel;
- }
-
-// ---------------------------------------------------------------------------
-// Handle UI Status RProperty change event. Read the new RProperty value
-// and publish the content on idle screen.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanHandler::PropertyEvent(
- CSysApGanPropertyListener& aPropertyListener,
- TInt aStatus )
- {
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent IN") ) );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent status %d"), aStatus ) );
-
- if( KErrNone == aStatus )
- {
- if( iGanModeListener == &aPropertyListener )
- {
- // GAN mode event
- TInt mode;
- TInt err = iPropertyGanMode.Get( mode );
- iGanMode = (TCoreAppUIsGanMode)mode;
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent RProp err %d"), err ) );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent GAN mode %d"), iGanMode ) );
- iSysApAppUi.SetSignalIndicatorL();
- }
- else if( iSignalLevelListener == &aPropertyListener )
- {
- // Signal level event
- TInt err = iPropertySignalLevel.Get( iGanSignalLevel );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent RProp err %d"), err ) );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent signal level %d"), iGanSignalLevel ) );
- iSysApAppUi.UpdateSignalBarsL();
- }
- }
- aPropertyListener.Subscribe();
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent OUT") ) );
- }
-
--- a/coreapplicationuis/SysAp/Src/gan/sysapganhandler.h Wed Sep 15 12:23:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +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: CSysApGanHandler class definition.
-*
-*/
-
-#ifndef SYSAPGANHANDLER_H_
-#define SYSAPGANHANDLER_H_
-
-#include <e32base.h>
-#include <e32property.h>
-#include "sysapganpropertylistener.h"
-
-class CSysApAppUi;
-
-/**
- * Listen RProperty events from GAN server.
- */
-NONSHARABLE_CLASS( CSysApGanHandler ) :
- public CBase,
- private MSysApGanPropertyObserver
- {
-public:
- /**
- * Static constructor.
- * @param aSysApUi Application UI.
- */
- static CSysApGanHandler* NewL( CSysApAppUi& aSysApAppUi );
-
- /**
- * Destructor.
- */
- ~CSysApGanHandler();
-
- /**
- * Tells if phone is in GAN mode.
- * @return ETrue if in GAN mode (not in GERAN)
- */
- TBool IsInGanMode();
-
- /**
- * Tells the signal bar level in GAN mode.
- * @return The number of signal bar blocks.
- */
- TInt GanSignalLevel();
-
-private: // from MSysApGanPropertyObserver
-
- /**
- * Receive RProperty notification. This same interface can receive
- * notifications from multiple listeners.
- * @param aPropertyListener Property lister that received the notification.
- * @param aStatus Status of the notification.
- */
- void PropertyEvent(
- CSysApGanPropertyListener& aPropertyListener, TInt aStatus );
-
-private:
- /**
- * C++ constructor.
- * @param aSysApUi Application UI.
- */
- CSysApGanHandler( CSysApAppUi& aSysApAppUi );
-
- /**
- * Symbian 2nd phase constructor.
- */
- void ConstructL();
-
-
-protected: // Data
-
- /**
- * Application UI.
- */
- CSysApAppUi& iSysApAppUi;
-
- /**
- * Current GAN mode.
- */
- TCoreAppUIsGanMode iGanMode;
-
- /**
- * Current GAN signal level.
- */
- TInt iGanSignalLevel;
-
- /**
- * GAN mode property.
- */
- RProperty iPropertyGanMode;
-
- /**
- * Signal level property.
- */
- RProperty iPropertySignalLevel;
-
- /**
- * Listener for GAN mode property.
- */
- CSysApGanPropertyListener* iGanModeListener;
-
- /**
- * Listener for signal level property.
- */
- CSysApGanPropertyListener* iSignalLevelListener;
-
- };
-
-#endif /* SYSAPGANHANDLER_H_ */
--- a/coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.cpp Wed Sep 15 12:23:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +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: Listens to given P&S key and notifies
-* observer whenever the value changes.
-*/
-
-
-#include "sysapganpropertylistener.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ constructor
-// ---------------------------------------------------------------------------
-//
-CSysApGanPropertyListener::CSysApGanPropertyListener(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver ) :
- CActive( CActive::EPriorityStandard ),
- iObserver( aObserver ),
- iProperty( aProperty )
- {
- CActiveScheduler::Add( this );
- }
-
-// ---------------------------------------------------------------------------
-// Static constructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanPropertyListener* CSysApGanPropertyListener::NewL(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver )
- {
- CSysApGanPropertyListener* self =
- new ( ELeave ) CSysApGanPropertyListener( aProperty, aObserver );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanPropertyListener::~CSysApGanPropertyListener()
- {
- Cancel(); // Cancel any request, if outstanding
- }
-
-// ---------------------------------------------------------------------------
-// Subscribe for property value changes.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanPropertyListener::Subscribe()
- {
- // Cancel any outstanding request
- Cancel();
-
- iProperty.Subscribe( iStatus );
- SetActive();
- }
-
-// ---------------------------------------------------------------------------
-// Property value changed.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanPropertyListener::RunL()
- {
- // Notify the observer.
- iObserver.PropertyEvent( *this, iStatus.Int() );
- }
-
-// ---------------------------------------------------------------------------
-// Subscription cancelled.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanPropertyListener::DoCancel()
- {
- iProperty.Cancel();
- }
-
-// ---------------------------------------------------------------------------
-// Error in RunL.
-// ---------------------------------------------------------------------------
-//
-TInt CSysApGanPropertyListener::RunError( TInt /*aError*/ )
- {
- // ignore error
- return KErrNone;
- }
--- a/coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.h Wed Sep 15 12:23:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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: CSysApGanPropertyListener class definition. Class for
-* RProperty changes from GAN server.
-*/
-
-
-#ifndef C_SYSAPGANPROPERTYLISTENER_H
-#define C_SYSAPGANPROPERTYLISTENER_H
-
-#include <e32base.h>
-#include <e32property.h>
-#include "msysapganpropertyobserver.h"
-
-/**
- * Listen RProperty events.
- */
-NONSHARABLE_CLASS( CSysApGanPropertyListener ) :
- public CActive
- {
-public:
- /**
- * Static constructor.
- * @param aProperty Property to listen to.
- * @param aObserver Object that is informed about about new IAP usage.
- */
- static CSysApGanPropertyListener* NewL(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver );
-
- /**
- * Destructor.
- */
- ~CSysApGanPropertyListener();
-
-protected:
- /**
- * C++ constructor.
- * @param aProperty Property to listen to.
- * @param aObserver Object that is informed about about new IAP usage.
- */
- CSysApGanPropertyListener(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver );
-
- /**
- * Symbian 2nd phase constructor.
- */
- void ConstructL();
-
-public:
- /**
- * Subscribes to a property.
- */
- void Subscribe();
-
-protected: // From CActive
-
- /**
- * Handles an active object's request completion event.
- */
- void RunL();
-
- /**
- * Cancels asynchronous request.
- */
- void DoCancel();
-
- /**
- * Handles a leave occurring in RunL().
- * @param aError Error that caused RunL to leave.
- */
- TInt RunError( TInt aError );
-
-protected: // Data
-
- /**
- * Observer to notifiy about property changes.
- */
- MSysApGanPropertyObserver& iObserver;
-
- /**
- * Property to listen to.
- */
- RProperty& iProperty;
-
- };
-
-#endif // C_SYSAPGANPROPERTYLISTENER_H
--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -197,10 +197,10 @@
RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
iKeypadWasLocked = iKeylock->IsKeyLockEnabled();
iKeylockPolicy->DisableKeyguardFeature();
+ iKeylock->DisableKeyLock();
if (!IsDeviceLocked())
{
iCallback.ExecCommandL( MSysapCallback::EResetKeyguardState );
- iKeylock->DisableKeyLock();
iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
}
// apply default light control
@@ -235,9 +235,8 @@
case EPSCTsyCallStateUninitialized:
case EPSCTsyCallStateNone:
{
-
- TInt keyGuardSetting;
- User::LeaveIfError(iSlideRepository->Get( KSlideKeyguard, keyGuardSetting ));
+ TInt keyGuardSetting;
+ iSlideRepository->Get( KSlideKeyguard, keyGuardSetting );
switch( ( TSlideSettingKeyguard ) keyGuardSetting )
{
case ESlideSettingsKeyguardActivatingOn:
--- a/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -108,7 +108,7 @@
/**
* Reserve the volume keys
*/
-void CSysApRemConObserver::StartRemconInterfaceL()
+void CSysApRemConObserver::StartRemconInterface()
{
TRACES( RDebug::Print( _L("CSysApRemConObserver::BlockKeys")));
if(!iInterfaceSelector)
--- a/coreapplicationuis/advancedtspcontroller/data/keyevent.rul Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/data/keyevent.rul Wed Oct 13 14:43:04 2010 +0300
@@ -105,6 +105,7 @@
<Tsp
routingTable='07'
keyEventRemConPlay='44'
+ keyEventRemConPause='46'
/>
<Tsp
@@ -112,48 +113,33 @@
ruleActiveAudio='00'
ruleLastPlayedAudio='03'
ruleForeground='01'
- ruleLaunchDefaultApp='04'
+ ruleLaunchDefaultApp='04'
defaultLaunchApp='102072C3'
/>
-
+
<Tsp
routingTable='08'
- keyEventRemConPause='46'
+ keyEventRemConStop='45'
/>
<Tsp
routingTable='08'
ruleActiveAudio='00'
- ruleLastPlayedAudio='03'
- ruleForeground='01'
- ruleDefaultApp='02'
- defaultApplicationPhone='100058B3'
- />
-
-
- <Tsp
- routingTable='09'
- keyEventRemConStop='45'
- />
-
- <Tsp
- routingTable='09'
- ruleActiveAudio='00'
ruleForeground='01'
ruleLastPlayedAudio='03'
ruleDefaultApp='02'
defaultApplicationPhone='100058B3'
- />
+ />
<Tsp
- routingTable='10'
+ routingTable='09'
KRemConSetAbsoluteVolume='1050'
KRemConAbsoluteVolumeNotification='0d31'
EGetFolderItemsOperationId='00'
/>
<Tsp
- routingTable='10'
+ routingTable='09'
transparentApplicationBTAudioMan='10208971'
/>
</actions>
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -20,10 +20,10 @@
PRJ_TESTEXPORTS
remconservercaps.mmh /epoc32/include/remcon/remconservercaps.mmh
-../data/keyevent.rul /epoc32/data/z/private/10282bc4/rules/keyevent.rul
-../data/keyevent.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyevent.rul
-../data/keyincall.rul /epoc32/data/z/private/10282bc4/rules/keyincall.rul
-../data/keyincall.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyincall.rul
+../data/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul
+../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul
+../data/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul
+../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul
PRJ_TESTMMPFILES
../../../group/RemConTspController.mmp
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/data/AknKeyEventMap.rss Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/kefmapper/data/AknKeyEventMap.rss Wed Oct 13 14:43:04 2010 +0300
@@ -44,22 +44,7 @@
devicemode = { KKefModeDefault };
eventtype = { KKefTypeShort | KKefTypeKey };
feedbacktype = 1; // 1 = Basic feedback
- },
- KEF_KEY_EVENT
- {
- scancode = { EStdKeyRightFunc, EStdKeyUpArrow } ;
- keycode = { EStdKeyApplicationC, EStdKeyApplicationC, EStdKeyApplicationC } ;
- devicemode = { 0, 1, 2 };
- eventtype = { KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong };
- },
-
- KEF_KEY_EVENT
- {
- scancode = { EStdKeyRightFunc, EStdKeyDownArrow } ;
- keycode = { EStdKeyApplicationD, EStdKeyApplicationD, EStdKeyApplicationD } ;
- devicemode = { 0, 1, 2 };
- eventtype = { KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong };
- }
+ }
};
}
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Wed Oct 13 14:43:04 2010 +0300
@@ -44,5 +44,5 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ecom.lib // ECom library
+LIBRARY ECom.lib // ECom library
LIBRARY hal.lib // HAL library
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -30,6 +30,7 @@
// LOCAL CONSTANTS
const TUid KCRUidCommsDb = { 0xcccccc00 };
+const TUid KCRUidOviMusic = { 0x101ffb51 };
_LIT(KDelimeter, ":");
_LIT(KPathDelimeter, "\\");
@@ -220,7 +221,7 @@
CreateDirectory( KCenRepBurPath );
ResetRepository( KCRUidCommsDb );
-
+ ResetRepository( KCRUidOviMusic );
TIMESTAMP( "RFS end" );
}
}
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -63,13 +63,13 @@
../data/testspec_015.txt /epoc32/winscw/c/testdata/testspec_015.txt
// Application specific exclude list(s) exported to rom drive
-../data/app_spec_rom_001.exc /epoc32/data/z/private/102073ea/excludes/app_spec_001.exc
+../data/app_spec_rom_001.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_001.exc
../data/app_spec_rom_001.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_001.exc
../data/app_spec_rom_001.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_001.exc
-../data/app_spec_rom_002.exc /epoc32/data/z/private/102073ea/excludes/app_spec_002.exc
+../data/app_spec_rom_002.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_002.exc
../data/app_spec_rom_002.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_002.exc
../data/app_spec_rom_002.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_002.exc
-../data/app_spec_rom_dummy.exc /epoc32/data/z/private/102073ea/excludes/app_spec_dummy.exc
+../data/app_spec_rom_dummy.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_dummy.exc
../data/app_spec_rom_dummy.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_dummy.exc
../data/app_spec_rom_dummy.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_dummy.exc
--- a/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -23,13 +23,13 @@
PRJ_EXPORTS
-../data/sensordatacompensationui.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
../rom/sensordatacompensatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacompensatorplugin.iby )
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -28,7 +28,7 @@
../sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul
// context source setting for test ps keys
-../101FB3E7.xml /epoc32/data/z/private/10282BC4/Settings/10282C74/101FB3E7.xml
+../101FB3E7.xml /epoc32/data/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml
// Iby export
../../rom/sensordatacontrollerplgtest.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacontrollerplgtest.iby )
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -27,14 +27,14 @@
../conf/sensordatacompensatorplgtest.cfg /epoc32/winscw/c/TestFramework/sensordatacompensatorplgtest.cfg
// Rule files
-../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
// context source setting for test ps keys
-../data/101FB3E7.xml /epoc32/release/winscw/udeb/z/private/10282BC4/Settings/10282C74/101FB3E7.xml
-../data/101FB3E7.xml /epoc32/release/winscw/urel/z/private/10282BC4/Settings/10282C74/101FB3E7.xml
+../data/101FB3E7.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml
+../data/101FB3E7.xml /epoc32/RELEASE/winscw/UREL/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml
PRJ_TESTMMPFILES
sensordatacompensatorplgtest.mmp
--- a/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -342,7 +342,7 @@
INFO_3( "Received key: enumValue = %d, keyType = %d, usbFileTransfer = %d",
aEnumValue, aKeyType, iUSBFileTransfer );
- //Start the listener once again
+ //Start the listener once again
if (aKeyType == ESideVolumeKeys)
{
iMMKeyBearerObserver->Start();
--- a/startupservices/SplashScreen/inc/SplashScreen.h Wed Sep 15 12:23:15 2010 +0300
+++ b/startupservices/SplashScreen/inc/SplashScreen.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -49,26 +49,6 @@
};
/**
-* CSplashShutdownWatcher
-*/
-class CSplashShutdownWatcher : public CActive
- {
-private:
- void ConstructL();
- CSplashShutdownWatcher();
-public:
- static CSplashShutdownWatcher* NewL();
- ~CSplashShutdownWatcher();
- void IssueRequest();
- void DoCancel();
- void RunL();
-private:
- RProperty iProperty;
- TInt iPSRemoveSplashState;
- };
-
-
-/**
* Base class for all windows
*
* @lib SplashScreen.lib
@@ -100,6 +80,8 @@
RWindowGroup Group() {return iGroup;};
+ TInt iPSRemoveSplashState;
+
protected:
TInt iLastScreenMode;
@@ -108,6 +90,7 @@
CWindowGc* iGc;
friend class CWsRedrawer; // needs to get at session
friend class CWindow; // needs to get at session
+ RProperty iProperty;
};
--- a/startupservices/SplashScreen/src/SplashScreen.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/startupservices/SplashScreen/src/SplashScreen.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -200,16 +200,27 @@
/////////////////////////// CWsClient implementation ////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
CWsClient::CWsClient()
-: CActive(CActive::EPriorityStandard)
+: CActive(CActive::EPriorityStandard),
+ iPSRemoveSplashState( ESplashRunning )
{
TRACES("CWsClient::CWsClient()");
- CActiveScheduler::Add(this);
}
void CWsClient::ConstructL()
{
TRACES("CWsClient::ConstructL(): Start");
+ RProperty::Define(KPSUidStartup,
+ KPSSplashShutdown,
+ RProperty::EInt,
+ KReadPolicy,
+ KWritePolicy );
+ RProperty::Set( KPSUidStartup, KPSSplashShutdown, iPSRemoveSplashState );
+ CActiveScheduler::Install(new (ELeave) CActiveScheduler);
+ CActiveScheduler::Add(this);
+ iProperty.Attach( KPSUidStartup, KPSSplashShutdown );
+ iProperty.Subscribe( iStatus );
+
// get a session going
User::LeaveIfError(iWs.Connect());
@@ -242,6 +253,8 @@
TRACES("CWsClient::ConstructL(): About to start CActiveScheduler");
+ CActiveScheduler::Start(); // start the active scheduler
+
TRACES("CWsClient::CWsClient(): End");
}
@@ -261,6 +274,7 @@
iGroup.Close();
// finish with window server
Cancel();
+ iProperty.Close();
iWs.Close();
TRACES("CWsClient::~CWsClient(): End");
}
@@ -419,79 +433,6 @@
TRACES("CMainWindow::HandlePointerEvent(): End");
}
-
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////// CSplashShutdownWatcher implementation ///////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-CSplashShutdownWatcher* CSplashShutdownWatcher::NewL()
- {
- CSplashShutdownWatcher* self = new(ELeave)CSplashShutdownWatcher();
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-void CSplashShutdownWatcher::ConstructL()
- {
- TRACES("CSplashShutdownWatcher::ConstructL(): Start");
- RProperty::Define(KPSUidStartup,
- KPSSplashShutdown,
- RProperty::EInt,
- KReadPolicy,
- KWritePolicy );
- RProperty::Set( KPSUidStartup, KPSSplashShutdown, iPSRemoveSplashState );
- iProperty.Attach( KPSUidStartup, KPSSplashShutdown );
- CActiveScheduler::Add(this);
- IssueRequest();
- TRACES("CSplashShutdownWatcher::ConstructL(): End");
- }
-
-CSplashShutdownWatcher::CSplashShutdownWatcher():CActive(CActive::EPriorityStandard),iPSRemoveSplashState( ESplashRunning ){}
-
-CSplashShutdownWatcher::~CSplashShutdownWatcher()
- {
- TRACES("~CSplashShutdownWatcher: Start");
- Cancel();
- iProperty.Close();
- TRACES("~CSplashShutdownWatcher: End");
- }
-
-void CSplashShutdownWatcher::IssueRequest()
- {
- iProperty.Subscribe( iStatus );
- SetActive();
- }
-
-void CSplashShutdownWatcher::DoCancel()
- {
- iProperty.Cancel();
- }
-
-void CSplashShutdownWatcher::RunL()
- {
- TRACES("CSplashShutdownWatcher::RunL(): Start");
- TInt state;
- RProperty::Get( KPSUidStartup, KPSSplashShutdown, state );
- TRACES1("CSplashShutdownWatcher::RunL(): Property change event received,Splash Shutdown state = %d", state);
-
- if ( state == ESplashShutdown )
- {
- TRACES("CSplashShutdownWatcher::RunL(): Exit requested");
- CActiveScheduler::Stop();
- }
- else
- {
- TRACES("CSplashShutdownWatcher::RunL(): UNEXPECTED state change event received!!, Issue request again");
- IssueRequest();
- }
- TRACES("CSplashShutdownWatcher::RunL(): End");
- }
-
-
//////////////////////////////////////////////////////////////////////////////
// CSplashWsClient implementation //
//////////////////////////////////////////////////////////////////////////////
@@ -568,57 +509,72 @@
{
TRACES("CSplashWsClient::RunL(): Start");
- TRACES("CSplashWsClient::RunL(): WS event");
-
- // get the event
- iWs.GetEvent(iWsEvent);
- const TInt eventType = iWsEvent.Type();
+ TInt state;
+ RProperty::Get( KPSUidStartup, KPSSplashShutdown, state );
+ TRACES1("CSplashWsClient::RunL(): KPSSplashShutdown state = %d", state);
- // take action on it
- switch (eventType)
+ if ( state != iPSRemoveSplashState )
{
- // window-group related event types
- case EEventKey:
+ TRACES("CSplashWsClient::RunL(): KPSSplashShutdown state has changed -> PS event");
+ if ( state == ESplashShutdown )
{
- TRACES("CSplashWsClient::RunL(): EEventKey");
- TKeyEvent& keyEvent=*iWsEvent.Key(); // get key event
- HandleKeyEventL (keyEvent);
- break;
- }
- // window related events
- case EEventPointer:
- {
- TRACES("CSplashWsClient::RunL(): EEventPointer");
- CWindow* window=(CWindow*)(iWsEvent.Handle()); // get window
- TPointerEvent& pointerEvent=*iWsEvent.Pointer();
- window->HandlePointerEvent (pointerEvent);
- break;
+ TRACES("CSplashWsClient::RunL(): Exit requested");
+ Exit();
}
- case EEventScreenDeviceChanged:
- {
- const TInt currentScreenMode = iScreen->CurrentScreenMode();
- TRACES2("CSplashWsClient::RunL() - EEventScreenDeviceChanged - iLastScreenMode: %d, currentScreenMode: %d", iLastScreenMode, currentScreenMode);
- if ( iLastScreenMode != currentScreenMode )
+ }
+ else
+ {
+ TRACES("CSplashWsClient::RunL(): WS event");
+
+ // get the event
+ iWs.GetEvent(iWsEvent);
+ const TInt eventType = iWsEvent.Type();
+
+ // take action on it
+ switch (eventType)
+ {
+ // window-group related event types
+ case EEventKey:
+ {
+ TRACES("CSplashWsClient::RunL(): EEventKey");
+ TKeyEvent& keyEvent=*iWsEvent.Key(); // get key event
+ HandleKeyEventL (keyEvent);
+ break;
+ }
+ // window related events
+ case EEventPointer:
+ {
+ TRACES("CSplashWsClient::RunL(): EEventPointer");
+ CWindow* window=(CWindow*)(iWsEvent.Handle()); // get window
+ TPointerEvent& pointerEvent=*iWsEvent.Pointer();
+ window->HandlePointerEvent (pointerEvent);
+ break;
+ }
+ case EEventScreenDeviceChanged:
{
- RDebug::Printf("[SS] CSplashWsClient::RunL() - EEventScreenDeviceChanged - real screen mode change detected!!!!");
- iScreen->SetAppScreenMode( currentScreenMode );
- TPixelsTwipsAndRotation currentRot;
- iScreen->GetScreenModeSizeAndRotation( currentScreenMode, currentRot );
- iMainWindow->Window().SetExtent( TPoint(0, 0), currentRot.iPixelSize );
- iMainWindow->Client()->Group().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront + 10000); // in front of the Status Bar
- iMainWindow->Window().Invalidate();
+ const TInt currentScreenMode = iScreen->CurrentScreenMode();
+ TRACES2("CSplashWsClient::RunL() - EEventScreenDeviceChanged - iLastScreenMode: %d, currentScreenMode: %d", iLastScreenMode, currentScreenMode);
+ if ( iLastScreenMode != currentScreenMode )
+ {
+ RDebug::Printf("[SS] CSplashWsClient::RunL() - EEventScreenDeviceChanged - real screen mode change detected!!!!");
+ iScreen->SetAppScreenMode( currentScreenMode );
+ TPixelsTwipsAndRotation currentRot;
+ iScreen->GetScreenModeSizeAndRotation( currentScreenMode, currentRot );
+ iMainWindow->Window().SetExtent( TPoint(0, 0), currentRot.iPixelSize );
+ iMainWindow->Client()->Group().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront + 10000); // in front of the Status Bar
+ iMainWindow->Window().Invalidate();
- iLastScreenMode = currentScreenMode;
+ iLastScreenMode = currentScreenMode;
+ }
+ TRACES("CSplashWsClient::RunL() - EEventScreenDeviceChanged - done");
}
- TRACES("CSplashWsClient::RunL() - EEventScreenDeviceChanged - done");
- }
- break;
- default:
- TRACES("CSplashWsClient::RunL(): default");
- break;
+ break;
+ default:
+ TRACES("CSplashWsClient::RunL(): default");
+ break;
+ }
+ IssueRequest(); // maintain outstanding request
}
- IssueRequest(); // maintain outstanding request
-
TRACES("CSplashWsClient::RunL(): End");
}
@@ -646,14 +602,11 @@
// make new client
TRACES("DoItL(): Start");
- CActiveScheduler::Install(new (ELeave) CActiveScheduler);
CSplashWsClient* client=new (ELeave) CSplashWsClient; // allocate new client
CleanupStack::PushL(client); // push, just in case
client->ConstructL(); // construct and run
- CSplashShutdownWatcher *shutdownWatcher=CSplashShutdownWatcher::NewL();
- CleanupStack::PushL(shutdownWatcher);
- CActiveScheduler::Start(); // start the active scheduler
- CleanupStack::PopAndDestroy(2, client); // destruct
+ CleanupStack::PopAndDestroy(); // destruct
+
TRACES("DoItL(): End");
}
--- a/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Wed Sep 15 12:23:15 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-10 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
Binary file startupservices/Startup/conf/startup.confml has changed
Binary file startupservices/Startup/conf/startup_101F8763.crml has changed
--- a/startupservices/Startup/inc/StartupAppUi.h Wed Sep 15 12:23:15 2010 +0300
+++ b/startupservices/Startup/inc/StartupAppUi.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -699,8 +699,6 @@
TInt iCounryListIndex;
TTime iTime;
- // AT command CFUN profile Change
- TInt iAtcmdCfunProfileChange;
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
TBool iTouchScreenCalibSupport;
--- a/startupservices/Startup/inc/StartupWelcomeCrKeys.h Wed Sep 15 12:23:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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: Startup Welcome keys
-*/
-
-#ifndef __STARTUPWELCOMECRKEYS_H
-#define __STARTUPWELCOMECRKEYS_H
-
-/**
- * The Uid for the repository itself
- * This repository holds the settings for Welcome2
- */
-const TUid KCRUidWelcome6 = { 0x200122A4 };
-
-/*
- * Used by PA to indicate if it has accomplished the task.
- */
-
-const TUint32 KPhoneActicationCompleted = 0x0000000B;
-#endif // STARTUPWELCOMCRKEYS_H
-
-// End of file
\ No newline at end of file
--- a/startupservices/Startup/src/StartupAppUi.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/startupservices/Startup/src/StartupAppUi.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -947,14 +947,13 @@
{
UpdateStartupUiPhase( EStartupUiPhaseAllDone );
}
- else
+ else
{
UpdateStartupUiPhase(EStartupUiPhaseAllDone+1);
}
//UpdateStartupUiPhase( EStartupUiPhaseAllDone );
-
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
TRACES("CStartupAppUi::DoStartupEndPart(): Exit application.");
@@ -971,7 +970,6 @@
CleanupStack::PopAndDestroy(repo);
}
-
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
// ---------------------------------------------------------------------------
// CStartupAppUi::ContinueStartupAfterToneL()
@@ -1590,10 +1588,7 @@
TBool CStartupAppUi::DosInOfflineModeL()
{
TRACES("CStartupAppUi::DosInOfflineModeL()");
-
- // Do not display the Offline mode query if the AT cmd cenrep key (KStartupATcmdCFUNProfileChange) value set to 1 or 2, iAtcmdCfunProfileChange member holds the key value
-
- if ( iOfflineModeSupported && (iAtcmdCfunProfileChange == 0) )
+ if ( iOfflineModeSupported )
{
TRACES1("CStartupAppUi::DosInOfflineModeL(): iOfflineModeSupported == %d", iOfflineModeSupported );
return UiInOfflineMode();
@@ -1656,19 +1651,6 @@
RProperty::Get(KPSUidStartup, KPSSimStatus, status);
TInt reply ( 0 );
- // AT Command CFUN specifc code
- CRepository* repository( NULL );
- TInt errVal;
- TRAP( errVal, repository = CRepository::NewL(KCRUidStartupConf) );
- if(errVal == KErrNone)
- {
- errVal = repository->Get(KStartupATcmdCFUNProfileChange, iAtcmdCfunProfileChange);
- if(!errVal && iAtcmdCfunProfileChange >0)
- {
- errVal = repository->Set(KStartupATcmdCFUNProfileChange, 0);
- }
- }
- delete repository;
if (status == ESimUsable || status == ESimReadable || status == ESimNotReady || !iSimSupported)
{
TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Show offline mode query if needed");
@@ -1719,18 +1701,6 @@
}
#endif
- // AT Command CFUN specifc code
- // AT command CFUN implementation plugin sets the key KStartupATcmdCFUNProfileChange to 1 in the case of Offline to Online profile change
- // AT command CFUN implementation plugin sets the key KStartupATcmdCFUNProfileChange to 2 in the case of Online to Offline profile change
- if(iAtcmdCfunProfileChange == 1)
- {
- reply = 0;
- }
- else if(iAtcmdCfunProfileChange == 2)
- {
- reply = 1;
- }
- // End AT Command CFUN specifc code
TRACES1("CStartupAppUi::ShowOfflineModeQueryL(): BootIntoOffline=%d.", reply);
TInt err = RProperty::Set( KPSUidStartup,
KStartupBootIntoOffline,
--- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009-10 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/startupservices/inc/StartupWelcomeCrKeys.h Wed Oct 13 14:43:04 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* 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: Startup Welcome keys
+*/
+
+#ifndef __STARTUPWELCOMECRKEYS_H
+#define __STARTUPWELCOMECRKEYS_H
+
+/**
+ * The Uid for the repository itself
+ * This repository holds the settings for Welcome2
+ */
+const TUid KCRUidWelcome6 = { 0x200122A4 };
+
+/*
+ * Used by PA to indicate if it has accomplished the task.
+ */
+
+const TUint32 KPhoneActicationCompleted = 0x0000000B;
+#endif // STARTUPWELCOMCRKEYS_H
+
+// End of file
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -153,13 +153,10 @@
TInt status = iOutOfDiskMonitor->GetDriveStatus(aDrive);
iOutOfDiskMonitor->SaveDriveStatus(aDrive, status, ETrue);
- if(status == KErrNone)
- {
- iOutOfDiskMonitor->ShowGlobalQueryIfNeededL();
- NotifyDiskSpace(warningThreshold,
+ iOutOfDiskMonitor->ShowGlobalQueryIfNeededL();
+ NotifyDiskSpace(warningThreshold,
criticalThreshold,
aDrive);
- }
TRACES("COutOfDiskNotifyObserver::DiskAddedL: End");
}
--- a/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Wed Oct 13 14:43:04 2010 +0300
@@ -17,5 +17,4 @@
?RequestOptionalRam@ROomMonitorSession@@QAEHHHHAAH@Z @ 16 NONAME ; int ROomMonitorSession::RequestOptionalRam(int, int, int, int &)
?RequestOptionalRam@ROomMonitorSession@@QAEXHHHAAVTRequestStatus@@@Z @ 17 NONAME ; void ROomMonitorSession::RequestOptionalRam(int, int, int, class TRequestStatus &)
?SetOomPriority@ROomMonitorSession@@QAEXW4TOomPriority@1@@Z @ 18 NONAME ; void ROomMonitorSession::SetOomPriority(enum ROomMonitorSession::TOomPriority)
- ?AppId@COomMonitorPlugin@@UBE?BVTUid@@XZ @ 19 NONAME ; class TUid const COomMonitorPlugin::AppId(void) const
--- a/sysresmonitoring/oommonitor/data/oomconfig.xml Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/data/oomconfig.xml Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
under the terms of the License "Eclipse Public License v1.0"
@@ -41,7 +41,7 @@
actions are needed. This value is meaningful only when "check" or "estimate" sync mode is
used with plugins.
-->
- <global_settings low_ram_threshold="3637" good_ram_threshold="4900" swap_usage_monitored="true" low_swap_threshold="15000" good_swap_threshold="25000" max_app_close_batch="3" default_wait_after_plugin="10" max_app_exit_time="2000">
+ <global_settings low_ram_threshold="3637" good_ram_threshold="4900" max_app_close_batch="3" default_wait_after_plugin="10" max_app_exit_time="2000">
</global_settings>
<!-- Application specific low RAM and good RAM thresholds are defined here. The higher values of
--- a/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Wed Oct 13 14:43:04 2010 +0300
@@ -23,5 +23,4 @@
_ZTV19COomMonitorPluginV2 @ 22 NONAME ; #<VT>#
_ZN18ROomMonitorSession18RequestOptionalRamEiiiR14TRequestStatus @ 23 NONAME
_ZN18ROomMonitorSession14SetOomPriorityENS_12TOomPriorityE @ 24 NONAME
- _ZNK17COomMonitorPlugin5AppIdEv @ 25 NONAME
--- a/sysresmonitoring/oommonitor/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -23,9 +23,9 @@
PRJ_EXPORTS
../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby)
-../data/oomconfig.xml /epoc32/release/winscw/udeb/z/private/10207218/oomconfig.xml
-../data/oomconfig.xml /epoc32/release/winscw/urel/z/private/10207218/oomconfig.xml
-../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/RELEASE/winscw/UREL/Z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml
PRJ_MMPFILES
oommonitor.mmp
--- a/sysresmonitoring/oommonitor/inc/oomaction.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomaction.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,7 +46,7 @@
* @since S60 5.0
* @param aBytesRequested ?description
*/
- virtual void FreeMemory(TInt aBytesRequested, TBool aIsDataPaged) = 0;
+ virtual void FreeMemory(TInt aBytesRequested) = 0;
/**
* @since S60 5.0
--- a/sysresmonitoring/oommonitor/inc/oomactionlist.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomactionlist.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -139,10 +139,9 @@
* occurs
*
* @since S60 5.0
- * @param aCurrentRamTarget the desired amount of free unpaged memory
- * @param aCurrentSwapTarget the desired amount of free paged memory
+ * @param aCurrentTarget the prio
*/
- inline void SetCurrentTargets(TUint aCurrentRamTarget, TUint aCurrentSwapTarget);
+ inline void SetCurrentTarget(TUint aCurrentTarget);
/**
* Switch all plugins to Off (Memory Good) state
@@ -203,9 +202,7 @@
TInt iCurrentActionIndex;
- TUint iCurrentRamTarget;
- TBool iSwapUsageMonitored;
- TUint iCurrentSwapTarget;
+ TUint iCurrentTarget;
/*
* Flag specifying that a OomMonitor event is in progress.
--- a/sysresmonitoring/oommonitor/inc/oomactionlist.inl Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomactionlist.inl Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,9 @@
return iPlugins[aIndex].iUid;
}
-inline void COomActionList::SetCurrentTargets(TUint aCurrentRamTarget, TUint aCurrentSwapTarget)
+inline void COomActionList::SetCurrentTarget(TUint aCurrentTarget)
{
- iCurrentRamTarget = aCurrentRamTarget;
- iCurrentSwapTarget = aCurrentSwapTarget;
+ iCurrentTarget = aCurrentTarget;
}
--- a/sysresmonitoring/oommonitor/inc/oomapplicationconfig.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomapplicationconfig.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,8 +71,6 @@
TUint iGoodRamThreshold;
TUint iLowRamThreshold;
- TUint iGoodSwapThreshold;
- TUint iLowSwapThreshold;
private:
--- a/sysresmonitoring/oommonitor/inc/oomcloseapp.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomcloseapp.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -52,7 +52,7 @@
* Call the COomAction::MemoryFreed when it is done
* @param aBytesRequested not used for clsoe app actions
*/
- virtual void FreeMemory(TInt aBytesRequested, TBool aIsDataPaged);
+ virtual void FreeMemory(TInt aBytesRequested);
~COomCloseApp();
--- a/sysresmonitoring/oommonitor/inc/oomconfig.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomconfig.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -83,9 +83,6 @@
inline void SetDefaultLowRamThreshold(TInt aLowRamThreshold);
inline void SetDefaultGoodRamThreshold(TInt aGoodRamThreshold);
- inline void SetSwapUsageMonitored(TBool aMonitored);
- inline void SetDefaultLowSwapThreshold(TInt aLowSwapThreshold);
- inline void SetDefaultGoodSwapThreshold(TInt aGoodSwapThreshold);
inline void SetMaxCloseAppBatch(TUint MaxCloseAppBatch);
inline void SetDefaultWaitAfterPlugin(TInt aMilliseconds);
inline void SetMaxAppExitTime(TInt aMilliseconds);
--- a/sysresmonitoring/oommonitor/inc/oomconfig.inl Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomconfig.inl Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,21 +34,6 @@
iGlobalConfig.iGoodRamThreshold = aGoodRamThreshold;
}
-void COomConfig::SetSwapUsageMonitored(TBool aMonitored)
- {
- iGlobalConfig.iSwapUsageMonitored = aMonitored;
- }
-
-void COomConfig::SetDefaultLowSwapThreshold(TInt aLowSwapThreshold)
- {
- iGlobalConfig.iLowSwapThreshold = aLowSwapThreshold;
- }
-
-void COomConfig::SetDefaultGoodSwapThreshold(TInt aGoodSwapThreshold)
- {
- iGlobalConfig.iGoodSwapThreshold = aGoodSwapThreshold;
- }
-
void COomConfig::SetMaxCloseAppBatch(TUint aMaxCloseAppBatch)
{
iGlobalConfig.iMaxCloseAppBatch = aMaxCloseAppBatch;
--- a/sysresmonitoring/oommonitor/inc/oomglobalconfig.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomglobalconfig.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,9 +42,6 @@
public:
TInt iLowRamThreshold;
TInt iGoodRamThreshold;
- TBool iSwapUsageMonitored;
- TInt iLowSwapThreshold;
- TInt iGoodSwapThreshold;
TUint iMaxCloseAppBatch;
TInt iDefaultWaitAfterPlugin;
TInt iMaxAppExitTime;
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitor.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitor.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,7 +19,6 @@
#ifndef OOMMEMORYMONITOR_H
#define OOMMEMORYMONITOR_H
-#include <u32hal.h>
#include <e32property.h>
#include <f32file.h>
#include <w32std.h>
@@ -70,9 +69,9 @@
public: // event handlers
void FreeMemThresholdCrossedL();
void AppNotExiting(TInt aWgId);
- void StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapSpaceTarget);
- void StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapSpaceTarget, TInt aMaxPriority);
- void FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId, TBool aDataPaged); // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation
+ void StartFreeSomeRamL(TInt aTargetFree);
+ void StartFreeSomeRamL(TInt aTargetFree, TInt aMaxPriority);
+ void FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId); // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation
void HandleFocusedWgChangeL();
static const COomGlobalConfig& GlobalConfig();
void SetPriorityBusy(TInt aWgId);
@@ -81,14 +80,13 @@
void ResetTargets();
void RequestTimerCallbackL();
void GetFreeMemory(TInt& aCurrentFreeMemory);
- void GetFreeSwapSpace(TInt& aCurrentFreeSwapSpace);
TActionTriggerType ActionTrigger() const;
#ifdef CLIENT_REQUEST_QUEUE
void ActionsCompleted(TInt aBytesFree, TBool aMemoryGood);
- TInt GoodRamThreshold() const;
- TInt LowRamThreshold() const;
+ TInt GoodThreshold() const;
+ TInt LowThreshold() const;
#endif
- void RequestFreeMemoryL(TInt aBytesRequested, TBool aDataPaged);
+ void RequestFreeMemoryL(TInt aBytesRequested);
void RequestFreeMemoryPandSL(TInt aBytesRequested);
/*
@@ -117,20 +115,12 @@
RFs iFs;
RWsSession iWs;
- TBool iDataPaged;
-
private: //data
// parameters for OOM watcher.
- TInt iLowRamThreshold;
- TInt iGoodRamThreshold;
- TInt iLowSwapThreshold;
- TInt iGoodSwapThreshold;
- TInt iCurrentRamTarget;
- TInt iCurrentSwapTarget;
-
-
-
+ TInt iLowThreshold;
+ TInt iGoodThreshold;
+ TInt iCurrentTarget;
#ifdef CLIENT_REQUEST_QUEUE
TInt iClientBytesRequested;
#endif
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,7 +31,6 @@
CMemoryMonitorSession();
#ifndef CLIENT_REQUEST_QUEUE
void CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood);
- TBool IsDataPaged(const RMessage2& aMessage);
#endif
private:
--- a/sysresmonitoring/oommonitor/inc/oomoutofmemorywatcher.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomoutofmemorywatcher.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,8 +33,7 @@
NONSHARABLE_CLASS(COutOfMemoryWatcher) : public CActive
{
public:
- static COutOfMemoryWatcher* NewL(CMemoryMonitor& aMonitor, TInt aLowRamThreshold, TInt aGoodRamThreshold,
- TBool aSwapUsageMonitored, TInt aLowSwapThreshold, TInt aGoodSwapThreshold);
+ static COutOfMemoryWatcher* NewL(CMemoryMonitor& aLafShutdown, TInt aLowThreshold, TInt aGoodThreshold);
~COutOfMemoryWatcher();
void Start();
@@ -44,17 +43,16 @@
* @param aLowThreshold If Ram Level drops below the low threshold Oom Monitor actions are started.
* @param aGoodThreshold When memory returns above the Good threshold then Oom Monitor stops freeing memory.
*/
- void UpdateThresholds(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold);
+ void UpdateThresholds(TInt aLowThreshold, TInt aGoodThreshold);
private:
- COutOfMemoryWatcher(CMemoryMonitor& aMonitor, TBool aSwapUsageMonitored);
- void ConstructL(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold);
+ COutOfMemoryWatcher(CMemoryMonitor& aLafShutdown);
+ void ConstructL(TInt aLowThreshold, TInt aGoodThreshold);
private: // from CActive
void DoCancel();
void RunL();
private: // data
RChangeNotifier iChangeNotifier;
- CMemoryMonitor& iMemoryMonitor;
- TBool iSwapUsageMonitored;
+ CMemoryMonitor& iLafShutdown;
};
#endif /*OOMOUTOFMEMORYWATCHER_H*/
--- a/sysresmonitoring/oommonitor/inc/oomrunplugin.h Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.h Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -44,7 +44,7 @@
// Run the OOM plugin in order to free memory
// Call the COomAction::MemoryFreed when it is done
- virtual void FreeMemory(TInt aBytesRequested, TBool aIsDataPaged);
+ virtual void FreeMemory(TInt aBytesRequested);
// Call the memory good function on the plugin but...
// only if there is an outstanding FreeMemory request
@@ -63,20 +63,8 @@
private:
- COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig,
- MOomActionObserver& aStateChangeObserver,
- COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin);
+ COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin);
- /**
- * Function: IsAppDataPaged
- * Checks whether the application which implements the given
- * COomMonitorPlugin is data paged
- * @param instance of the monitor plugin.
- * @return ETrue if the application is data paged, else EFalse;
- */
- TBool IsAppDataPaged( COomMonitorPlugin& aPlugin ) const;
-
-private:
TUint iPluginId;
COomMonitorPlugin& iPlugin;
--- a/sysresmonitoring/oommonitor/src/oomactionlist.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomactionlist.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -327,16 +327,10 @@
TInt maxBatchSize = globalConfig.iMaxCloseAppBatch;
TInt numberOfRunningActions = 0;
- TInt freeRamEstimate = 0; // The amount of free memory we expect to be free after the currently initiated operations
- HAL::Get(HALData::EMemoryRAMFree, freeRamEstimate);
- TUint64 freeSwapEstimate = 0;
- if (iSwapUsageMonitored)
- {
- SVMSwapInfo swapInfo;
- UserSvr::HalFunction(EHalGroupVM, EVMHalGetSwapInfo, &swapInfo, 0);
- freeSwapEstimate = swapInfo.iSwapFree;
- }
-
+ TInt memoryEstimate; // The amount of free memory we expect to be free after the currently initiated operations
+ HAL::Get(HALData::EMemoryRAMFree, memoryEstimate);
+
+
while (iCurrentActionIndex < iActionRefs.Count()
&& iActionRefs[iCurrentActionIndex].Priority() <= aMaxPriority)
{
@@ -357,20 +351,7 @@
iMonitor.SetMemoryMonitorStatusProperty(EFreeingMemory);
- // At the moment the actions don't make any difference between freeing
- // RAM and freeing swap. So we try to free the biggest of the two.
- // Until the plugins are updated to make a distinction between swap and RAM this is the best
- // we can do. For application close actions the amount to try to free is ignored anyway.
- TUint amountToTryToFree = 0;
- if (iCurrentRamTarget > freeRamEstimate)
- {
- amountToTryToFree = iCurrentRamTarget - freeRamEstimate;
- }
- if (iSwapUsageMonitored && (iCurrentSwapTarget > freeSwapEstimate) && ((iCurrentSwapTarget - freeSwapEstimate) > amountToTryToFree))
- {
- amountToTryToFree = iCurrentSwapTarget - freeSwapEstimate;
- }
- action->FreeMemory(amountToTryToFree, iMonitor.iDataPaged);
+ action->FreeMemory(iCurrentTarget - memoryEstimate);
memoryFreeingActionRun = ETrue;
// Actions with EContinueIgnoreMaxBatchSize don't add to the tally of running actions
@@ -378,12 +359,12 @@
numberOfRunningActions++;
// Update our estimate of how much RAM we think we'll have after this operation
- freeRamEstimate += ref.RamEstimate();
+ memoryEstimate += ref.RamEstimate();
// Do we estimate that we are freeing enough memory (only applies if the sync mode is "esimtate" for this action)
TBool estimatedEnoughMemoryFreed = EFalse;
if ((ref.SyncMode() == EEstimate)
- && (freeRamEstimate >= iCurrentRamTarget))
+ && (memoryEstimate >= iCurrentTarget))
{
estimatedEnoughMemoryFreed = ETrue;
}
@@ -410,15 +391,9 @@
// No usable memory freeing action has been found, so we give up
TRACES("COomActionList::FreeMemory: No usable memory freeing action has been found");
iMonitor.ResetTargets();
- TInt freeMemory = 0;
+ TInt freeMemory;
iMonitor.GetFreeMemory(freeMemory);
- TInt freeSwap = 0;
- if (iSwapUsageMonitored)
- {
- iMonitor.GetFreeSwapSpace(freeSwap);
- }
- if ((freeMemory >= iCurrentRamTarget) &&
- ((!iSwapUsageMonitored) || (freeSwap >= iCurrentSwapTarget)))
+ if (freeMemory >= iCurrentTarget)
{
SwitchOffPlugins();
iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold);
@@ -595,15 +570,9 @@
//and therefore we are still in a memory freeing state
iFreeingMemory = EFalse;
// If all of the actions are complete then check memory and run more if necessary
- TInt freeMemory = 0;
+ TInt freeMemory;
iMonitor.GetFreeMemory(freeMemory);
- TInt freeSwap = 0;
- if (iSwapUsageMonitored)
- {
- iMonitor.GetFreeSwapSpace(freeSwap);
- }
- if ((freeMemory < iCurrentRamTarget) ||
- (iSwapUsageMonitored && (freeSwap < iCurrentSwapTarget)))
+ if (freeMemory < iCurrentTarget)
// If we are still below the good-memory-threshold then continue running actions
{
iCurrentActionIndex++;
@@ -613,8 +582,7 @@
// There are no more actions to try, so we give up
TRACES1("COomActionList::StateChanged: All current actions complete, below good threshold with no more actions available. freeMemory=%d", freeMemory);
iMonitor.ResetTargets();
- if ((freeMemory >= iCurrentRamTarget) &&
- ((!iSwapUsageMonitored) || (freeSwap >= iCurrentSwapTarget)))
+ if (freeMemory >= iCurrentTarget)
{
SwitchOffPlugins();
iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold);
@@ -669,7 +637,6 @@
FUNC_LOG;
iCurrentActionIndex = 0;
- iSwapUsageMonitored = aConfig.GlobalConfig().iSwapUsageMonitored;
iFreeingMemory = EFalse;
// Get the list of V1 and V2 plugins available to the system
@@ -696,7 +663,7 @@
COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginListV2->Uid(pluginIndex));
// Create an action acording to the config
- COomRunPlugin* action = COomRunPlugin::NewL(iPluginListV2->Uid(pluginIndex), pluginConfig, *this, iPluginListV2->Implementation(pluginIndex), &(iPluginListV2->Implementation(pluginIndex)));
+ COomRunPlugin* action = COomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginListV2->Implementation(pluginIndex), &(iPluginListV2->Implementation(pluginIndex)));
iRunPluginActions.AppendL(action);
}
--- a/sysresmonitoring/oommonitor/src/oomapplicationconfig.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomapplicationconfig.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -59,8 +59,6 @@
iGoodRamThreshold = KOomThresholdUnset;
iLowRamThreshold = KOomThresholdUnset;
- iGoodSwapThreshold = KOomThresholdUnset;
- iLowSwapThreshold = KOomThresholdUnset;
}
COomApplicationConfig::COomApplicationConfig(TUint aApplicationId) : iApplicationId(aApplicationId)
--- a/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -185,36 +185,17 @@
iClientRequestActive = ETrue;
TClientRequest* request = iQueue.First();
-
- RThread clientThread;
- TInt err = (request->iRequestFreeRamMessage).Client(clientThread);
- TBool dataPaged = EFalse;
- if(err == KErrNone)
- {
- RProcess processName;
- err = clientThread.Process(processName);
- if(err == KErrNone)
- {
- dataPaged = processName.DefaultDataPaged();
- processName.Close();
- }
- clientThread.Close();
- }
- else
- {
- OomMonitorPanic(KInvalidClientRequestType);
- }
-
+
switch (request->iClientRequestType)
{
case EClientServerRequestOptionalRam:
{
TInt pluginId = request->iRequestFreeRamMessage.Int2();
- iMonitor.FreeOptionalRamL(request->iBytesRequested, pluginId, dataPaged);
+ iMonitor.FreeOptionalRamL(request->iBytesRequested, pluginId);
break;
}
case EClientServerRequestFreeMemory:
- iMonitor.RequestFreeMemoryL(request->iBytesRequested, dataPaged);
+ iMonitor.RequestFreeMemoryL(request->iBytesRequested);
break;
case EPublishAndSubscribe:
iMonitor.RequestFreeMemoryPandSL(request->iBytesRequested);
@@ -277,7 +258,7 @@
message = request->iRequestFreeRamMessage;
if (!message.IsNull())
{
- TInt memoryAvailable = aBytesFree - iMonitor.GoodRamThreshold();
+ TInt memoryAvailable = aBytesFree - iMonitor.GoodThreshold();
TInt minimumNeeded = message.Int1();
if (memoryAvailable >= minimumNeeded)
{
--- a/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -40,7 +40,7 @@
// Close the application in order to free memory
// Call the COomAction::MemoryFreed when it is done
-void COomCloseApp::FreeMemory(TInt, TBool aIsDataPaged)
+void COomCloseApp::FreeMemory(TInt)
{
FUNC_LOG;
@@ -56,24 +56,7 @@
iAppCloseWatcher->Start(iCurrentTask);
// Tell the app to close
TRACES1("COomCloseApp::FreeMemory: Closing app with window group id %d",iWgId);
-
- RThread thread;
- TInt err=thread.Open(iCurrentTask.ThreadId());
- if (err == KErrNone)
- {
- RProcess process;
- err = thread.Process(process);
- if(err == KErrNone)
- {
- TBool isDataPaged = process.DefaultDataPaged();
- if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged ))
- {
- iCurrentTask.EndTask();
- }
- process.Close();
- }
- thread.Close();
- }
+ iCurrentTask.EndTask();
}
COomCloseApp::~COomCloseApp()
--- a/sysresmonitoring/oommonitor/src/oomconfigparser.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomconfigparser.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,9 +37,6 @@
KOomErrAppIdleSettingsMustComeAfterAppCloseSettings,
KOomErrLowRamErrorInGlobalSettings,
KOomErrGoodRamErrorInGlobalSettings,
-KOomErrSwapUsageMonitoredErrorInGlobalSettings,
-KOomErrLowSwapErrorInGlobalSettings,
-KOomErrGoodSwapErrorInGlobalSettings,
KOomErrMaxCloseErrorInGlobalSettings,
KOomErrDefaultPriorityErrorInGlobalSettings,
KOomErrMissingUidFromAppCloseConfig,
@@ -121,9 +118,6 @@
// Global settings attribute names
_LIT8(KOomAttributeLowRamThreshold, "low_ram_threshold");
_LIT8(KOomAttributeGoodRamThreshold, "good_ram_threshold");
-_LIT8(KOomAttributeSwapUsageMonitored, "swap_usage_monitored");
-_LIT8(KOomAttributeLowSwapThreshold, "low_swap_threshold");
-_LIT8(KOomAttributeGoodSwapThreshold, "good_swap_threshold");
_LIT8(KOomAttributeMaxAppCloseBatch, "max_app_close_batch");
_LIT8(KOomAttributeDefaultWaitAfterPlugin, "default_wait_after_plugin");
_LIT8(KOomAttributeMaxAppExitTime , "max_app_exit_time");
@@ -389,39 +383,6 @@
if (err == KErrNone)
{
- TInt swapUsageMonitored;
- TInt err = GetValueFromBooleanAttributeList(aAttributes, KOomAttributeSwapUsageMonitored, swapUsageMonitored);
-
- if (err == KErrNone)
- iConfig.SetSwapUsageMonitored(swapUsageMonitored);
- else
- ConfigError(KOomErrSwapUsageMonitoredErrorInGlobalSettings);
- }
-
- if (err == KErrNone)
- {
- TInt defaultLowSwapThreshold;
- TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowSwapThreshold, defaultLowSwapThreshold);
-
- if (err == KErrNone)
- iConfig.SetDefaultLowSwapThreshold(defaultLowSwapThreshold * KBytesInMegabyte);
- else
- ConfigError(KOomErrLowSwapErrorInGlobalSettings);
- }
-
- if (err == KErrNone)
- {
- TInt defaultGoodSwapThreshold;
- TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodSwapThreshold, defaultGoodSwapThreshold);
-
- if (err == KErrNone)
- iConfig.SetDefaultGoodSwapThreshold(defaultGoodSwapThreshold * KBytesInMegabyte);
- else
- ConfigError(KOomErrGoodSwapErrorInGlobalSettings);
- }
-
- if (err == KErrNone)
- {
TInt defaultMaxCloseAppBatch;
TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeMaxAppCloseBatch, defaultMaxCloseAppBatch);
@@ -518,39 +479,6 @@
ConfigError(KOomErrBadGoodThresholdValueForAppConfig);
}
- // Set the app specific swap thresholds (if they exist)
- // Get the app specific low swap threshold
- if (err == KErrNone)
- {
- TUint lowThreshold;
- err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowSwapThreshold, lowThreshold);
- if (err == KErrNone)
- {
- appConfig->iLowSwapThreshold = lowThreshold * KBytesInMegabyte;
- }
- else if (err == KErrNotFound)
- err = KErrNone;
-
- if (err != KErrNone)
- ConfigError(KOomErrBadLowThresholdValueForAppConfig);
- }
-
- // Get the app specific good swapthreshold
- if (err == KErrNone)
- {
- TUint goodThreshold;
- err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodSwapThreshold, goodThreshold);
- if (err == KErrNone)
- {
- appConfig->iGoodSwapThreshold = goodThreshold * KBytesInMegabyte;
- }
- else if (err == KErrNotFound)
- err = KErrNone;
-
- if (err != KErrNone)
- ConfigError(KOomErrBadGoodThresholdValueForAppConfig);
- }
-
// Add the applciation config to the main config
if ((err == KErrNone) && (appConfig))
{
--- a/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -18,7 +18,6 @@
#include <hal.h>
-
#include <UikonInternalPSKeys.h>
#include "oommemorymonitor.h"
@@ -163,7 +162,7 @@
#endif
- iOOMWatcher = COutOfMemoryWatcher::NewL(*this, iLowRamThreshold, iGoodRamThreshold, iConfig->GlobalConfig().iSwapUsageMonitored, iLowSwapThreshold, iGoodSwapThreshold);
+ iOOMWatcher = COutOfMemoryWatcher::NewL(*this, iLowThreshold, iGoodThreshold);
iOOMWatcher->Start();
iWservEventReceiver = new(ELeave) CWservEventReceiver(*this, iWs);
@@ -186,86 +185,61 @@
FUNC_LOG;
iActionTrigger = ERamRotation;
- StartFreeSomeRamL(iGoodRamThreshold, iGoodSwapThreshold);
+ StartFreeSomeRamL(iGoodThreshold);
}
void CMemoryMonitor::HandleFocusedWgChangeL()
{
FUNC_LOG;
- TInt oldGoodRamThreshold = iGoodRamThreshold;
- TInt oldLowRamThreshold = iLowRamThreshold;
- TInt oldGoodSwapThreshold = iGoodSwapThreshold;
- TInt oldLowSwapThreshold = iLowSwapThreshold;
-
+ TInt oldGoodThreshold = iGoodThreshold;
+ TInt oldLowThreshold = iLowThreshold;
+
// Refresh the low and good memory thresholds as they may have changed due to the new foreground application
RefreshThresholds();
- if ((oldGoodRamThreshold != iGoodRamThreshold)
- || (oldLowRamThreshold != iLowRamThreshold)
- || (oldGoodSwapThreshold != iGoodSwapThreshold)
- || (oldLowSwapThreshold != iLowSwapThreshold))
+ if ((oldGoodThreshold != iGoodThreshold)
+ || (oldLowThreshold != iLowThreshold))
// If the thresholds have changed then update the memory watched
{
- iOOMWatcher->UpdateThresholds(iLowRamThreshold, iGoodRamThreshold, iLowSwapThreshold, iGoodSwapThreshold);
+ iOOMWatcher->UpdateThresholds(iLowThreshold, iGoodThreshold);
}
// If the available memory is less than the low memory threshold then free some RAM
User::CompressAllHeaps();
- TInt currentFreeRam = 0;
- HAL::Get( HALData::EMemoryRAMFree, currentFreeRam );
- TInt currentFreeSwap = 0;
- if (iConfig->GlobalConfig().iSwapUsageMonitored)
- {
- SVMSwapInfo swapInfo;
- UserSvr::HalFunction(EHalGroupVM, EVMHalGetSwapInfo, &swapInfo, 0);
- currentFreeSwap = swapInfo.iSwapFree;
- }
+ TInt current = 0;
+ HAL::Get( HALData::EMemoryRAMFree, current );
- if ((currentFreeRam < iLowRamThreshold) ||
- (iConfig->GlobalConfig().iSwapUsageMonitored && (currentFreeSwap < iLowSwapThreshold)))
+ if (current < iLowThreshold)
{
iActionTrigger = ERamRotation;
- StartFreeSomeRamL(iGoodRamThreshold, iGoodSwapThreshold);
+ StartFreeSomeRamL(iGoodThreshold);
}
}
-void CMemoryMonitor::StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapTarget)
+void CMemoryMonitor::StartFreeSomeRamL(TInt aTargetFree)
{
- StartFreeSomeRamL(aFreeRamTarget, aFreeSwapTarget, KOomPriorityInfinate - 1);
+ StartFreeSomeRamL(aTargetFree, KOomPriorityInfinate - 1);
}
-void CMemoryMonitor::StartFreeSomeRamL(TInt aFreeRamTarget, TInt aFreeSwapTarget, TInt aMaxPriority) // The maximum priority of action to run
+void CMemoryMonitor::StartFreeSomeRamL(TInt aTargetFree, TInt aMaxPriority) // The maximum priority of action to run
{
FUNC_LOG;
- TRACES4("MemoryMonitor::StartFreeSomeRamL: aFreeRamTarget = %d, iCurrentRamTarget = %d, aFreeSwapSpaceTarget = %d, iCurrentSwapTarget = %d", aFreeRamTarget, iCurrentRamTarget, aFreeSwapTarget, iCurrentSwapTarget);
+ TRACES2("MemoryMonitor::StartFreeSomeRamL: aTargetFree = %d, iCurrentTarget = %d", aTargetFree, iCurrentTarget);
// Update the target if new target is higher. If the target is lower than the current target and memory
// is currently being freed then we do not want to reduce the amount of memory this operation frees.
- if (aFreeRamTarget > iCurrentRamTarget)
- {
- iCurrentRamTarget = aFreeRamTarget;
- }
-
- if (aFreeSwapTarget > iCurrentSwapTarget)
- {
- iCurrentSwapTarget = aFreeSwapTarget;
- }
+ if (aTargetFree > iCurrentTarget)
+ iCurrentTarget = aTargetFree;
// check if there is enough free memory already.
- TInt freeMemory = 0;
+ TInt freeMemory;
GetFreeMemory(freeMemory);
- TInt freeSwap = 0;
- if (iConfig->GlobalConfig().iSwapUsageMonitored)
- {
- GetFreeSwapSpace(freeSwap);
- }
- TRACES2("MemoryMonitor::StartFreeSomeRamL, freeMemory = %d, freeSwap = %d", freeMemory, freeSwap);
+ TRACES1("MemoryMonitor::StartFreeSomeRamL, freeMemory = %d", freeMemory);
- if ((freeMemory >= iCurrentRamTarget) &&
- ((!iConfig->GlobalConfig().iSwapUsageMonitored) || (freeSwap >= iCurrentSwapTarget)))
+ if (freeMemory >= iCurrentTarget)
{
if (iLastMemoryMonitorStatusProperty != EFreeingMemory)
{
@@ -288,7 +262,7 @@
// Build the list of memory freeing actions
iOomActionList->BuildActionListL(*iOomWindowGroupList, *iConfig);
- iOomActionList->SetCurrentTargets(iCurrentRamTarget, iCurrentSwapTarget);
+ iOomActionList->SetCurrentTarget(iCurrentTarget);
// Run the memory freeing actions
iOomActionList->FreeMemory(aMaxPriority);
@@ -299,30 +273,27 @@
FUNC_LOG;
iActionTrigger = EPublishAndSubscribe;
- StartFreeSomeRamL(aBytesRequested + iLowRamThreshold, iLowSwapThreshold);
+ StartFreeSomeRamL(aBytesRequested + iLowThreshold);
}
-void CMemoryMonitor::RequestFreeMemoryL(TInt aBytesRequested, TBool aDataPaged)
+void CMemoryMonitor::RequestFreeMemoryL(TInt aBytesRequested)
{
FUNC_LOG;
iActionTrigger = EClientServerRequestFreeMemory;
- iDataPaged = aDataPaged;
- StartFreeSomeRamL(iLowRamThreshold, aBytesRequested + iLowSwapThreshold);
+ StartFreeSomeRamL(aBytesRequested + iLowThreshold);
}
-void CMemoryMonitor::FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId, TBool aDataPaged) // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation
+void CMemoryMonitor::FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId) // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation
{
FUNC_LOG;
iActionTrigger = EClientServerRequestOptionalRam;
- iDataPaged = aDataPaged;
-
// Calculate the priority of the allocation (the priority of the plugin that will clear it up - 1)
TInt priorityOfAllocation = iConfig->GetPluginConfig(aPluginId).CalculatePluginPriority(*iOomWindowGroupList) - 1;
- StartFreeSomeRamL(aBytesRequested + iGoodRamThreshold, iLowSwapThreshold, priorityOfAllocation);
+ StartFreeSomeRamL(aBytesRequested + iGoodThreshold, priorityOfAllocation);
}
void CMemoryMonitor::GetFreeMemory(TInt& aCurrentFreeMemory)
@@ -337,17 +308,6 @@
TRACES1("CMemoryMonitor::GetFreeMemory: Free RAM now %d", aCurrentFreeMemory);
}
-void CMemoryMonitor::GetFreeSwapSpace(TInt& aCurrentFreeSwapSpace)
- {
- FUNC_LOG;
-
- SVMSwapInfo swapInfo;
- UserSvr::HalFunction(EHalGroupVM, EVMHalGetSwapInfo, &swapInfo, 0);
- aCurrentFreeSwapSpace = swapInfo.iSwapFree;
-
- TRACES1("CMemoryMonitor::GetFreeSwapSpace: Free swap space now %d", aCurrentFreeSwapSpace);
- }
-
#ifndef CLIENT_REQUEST_QUEUE
TInt CMemoryMonitor::WatchdogStatusStatusChanged(TAny* aPtr)
{
@@ -398,11 +358,9 @@
iOomWindowGroupList->Refresh();
// Calculate the desired good threshold, this could be the globally configured value...
- iGoodRamThreshold = CMemoryMonitor::GlobalConfig().iGoodRamThreshold;
- iLowRamThreshold = CMemoryMonitor::GlobalConfig().iLowRamThreshold;
- iGoodSwapThreshold = CMemoryMonitor::GlobalConfig().iGoodSwapThreshold;
- iLowSwapThreshold = CMemoryMonitor::GlobalConfig().iLowSwapThreshold;
- TRACES4("CMemoryMonitor::RefreshThresholds: Global Good Ram Threshold = %d, Global Low Ram Threshold = %d, Global Good Swap Threshold = %d, Global Low Swap Threshold = %d", iGoodRamThreshold, iLowRamThreshold, iGoodSwapThreshold, iLowSwapThreshold);
+ iGoodThreshold = CMemoryMonitor::GlobalConfig().iGoodRamThreshold;
+ iLowThreshold = CMemoryMonitor::GlobalConfig().iLowRamThreshold;
+ TRACES2("CMemoryMonitor::RefreshThresholds: Global Good Threshold = %d, Global Low Threshold = %d", iGoodThreshold, iLowThreshold);
#ifdef _DEBUG
TRACES("CMemoryMonitor::RefreshThresholds: Dumping Window Group List");
@@ -435,27 +393,16 @@
// If this application configuration overrides the good_ram_threshold then set it
if (iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold != KOomThresholdUnset)
{
- iGoodRamThreshold = iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold;
- TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Good Ram Threshold = %d", foregroundAppId, iGoodRamThreshold);
+ iGoodThreshold = iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold;
+ TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Good Threshold = %d", foregroundAppId, iGoodThreshold);
}
// If this application configuration overrides the low_ram_threshold then set it
if (iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold != KOomThresholdUnset)
{
- iLowRamThreshold = iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold;
- TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Low Ram Threshold = %d", foregroundAppId, iLowRamThreshold);
+ iLowThreshold = iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold;
+ TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Low Threshold = %d", foregroundAppId, iLowThreshold);
}
- if (iConfig->GetApplicationConfig(foregroundAppId).iGoodSwapThreshold != KOomThresholdUnset)
- {
- iGoodSwapThreshold = iConfig->GetApplicationConfig(foregroundAppId).iGoodSwapThreshold;
- TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Good Swap Threshold = %d", foregroundAppId, iGoodSwapThreshold);
- }
- // If this application configuration overrides the low_swap_threshold then set it
- if (iConfig->GetApplicationConfig(foregroundAppId).iLowSwapThreshold != KOomThresholdUnset)
- {
- iLowSwapThreshold = iConfig->GetApplicationConfig(foregroundAppId).iLowSwapThreshold;
- TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Low Swap Threshold = %d", foregroundAppId, iLowSwapThreshold);
- }
}
}
@@ -476,9 +423,8 @@
//we reset the target when a memory free operation completes, to deal with the case
//where the operation was initiated with a target larger than the current good threshold
- iCurrentRamTarget = iGoodRamThreshold;
- iCurrentSwapTarget = iGoodSwapThreshold;
- iOomActionList->SetCurrentTargets(iCurrentRamTarget, iCurrentSwapTarget);
+ iCurrentTarget = iGoodThreshold;
+ iOomActionList->SetCurrentTarget(iCurrentTarget);
}
void CMemoryMonitor::SetPriorityBusy(TInt aWgId)
@@ -506,14 +452,14 @@
}
#ifdef CLIENT_REQUEST_QUEUE
-TInt CMemoryMonitor::GoodRamThreshold() const
+TInt CMemoryMonitor::GoodThreshold() const
{
- return iGoodRamThreshold;
+ return iGoodThreshold;
}
-TInt CMemoryMonitor::LowRamThreshold() const
+TInt CMemoryMonitor::LowThreshold() const
{
- return iLowRamThreshold;
+ return iLowThreshold;
}
void CMemoryMonitor::ActionsCompleted(TInt aBytesFree, TBool aMemoryGood)
--- a/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -60,35 +60,6 @@
return Server().Monitor();
#endif
}
-#ifndef CLIENT_REQUEST_QUEUE
-TBool CMemoryMonitorSession::IsDataPaged(const RMessage2& aMessage)
- {
- RThread clientThread;
- TInt err = aMessage.Client(clientThread);
- TBool dataPaged = EFalse;
- if(err == KErrNone)
- {
- RProcess processName;
- err = clientThread.Process(processName);
- if(err == KErrNone)
- {
- dataPaged = processName.DefaultDataPaged();
- processName.Close();
- clientThread.Close();
- }
- else
- {
- clientThread.Close();
- PanicClient(aMessage, EPanicIllegalFunction);
- }
- }
- else
- {
- PanicClient(aMessage, EPanicIllegalFunction);
- }
- return dataPaged;
- }
-#endif
void CMemoryMonitorSession::ServiceL(const RMessage2& aMessage)
{
@@ -108,7 +79,7 @@
ClientRequestQueue().RequestFreeMemoryL(aMessage);
#else
iRequestFreeRam = aMessage;
- Monitor().RequestFreeMemoryL(aMessage.Int0(), IsDataPaged(aMessage));
+ Monitor().RequestFreeMemoryL(aMessage.Int0());
#endif
break;
@@ -132,7 +103,7 @@
#else
iRequestFreeRam = aMessage;
iMinimumMemoryRequested = aMessage.Int1();
- Monitor().FreeOptionalRamL(aMessage.Int0(), aMessage.Int2(), IsDataPaged(aMessage));
+ Monitor().FreeOptionalRamL(aMessage.Int0(), aMessage.Int2());
#endif
break;
--- a/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -87,16 +87,7 @@
return iMemoryMonitor->iWs;
}
-//-----------------------------------------------------------------------------
-// Function: AppId
-// Function returns the UID3 of the application which implements the
-// plugin
-//-----------------------------------------------------------------------------
-//
-EXPORT_C const TUid COomMonitorPlugin::AppId() const
- {
- return KNullUid;
- }
+
EXPORT_C void COomMonitorPluginV2::FreeRam()
{
@@ -146,15 +137,3 @@
}
while (wgId>0);
}
-
-//-----------------------------------------------------------------------------
-// Function: AppId
-// Function returns the UID3 of the application which implements the
-// plugin
-//-----------------------------------------------------------------------------
-//
-const TUid CAppOomMonitorPlugin::AppId() const
- {
- return iAppUid;
- }
-
--- a/sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,13 +30,13 @@
//
// ---------------------------------------------------------
//
-COutOfMemoryWatcher* COutOfMemoryWatcher::NewL(CMemoryMonitor& aMonitor, TInt aLowRamThreshold, TInt aGoodRamThreshold, TBool aSwapUsageMonitored, TInt aLowSwapThreshold, TInt aGoodSwapThreshold)
+COutOfMemoryWatcher* COutOfMemoryWatcher::NewL(CMemoryMonitor& aMonitor, TInt aLowThreshold, TInt aGoodThreshold)
{
FUNC_LOG;
- COutOfMemoryWatcher* self = new (ELeave) COutOfMemoryWatcher(aMonitor, aSwapUsageMonitored);
+ COutOfMemoryWatcher* self = new (ELeave) COutOfMemoryWatcher(aMonitor);
CleanupStack::PushL(self);
- self->ConstructL(aLowRamThreshold, aGoodRamThreshold, aLowSwapThreshold, aGoodSwapThreshold);
+ self->ConstructL(aLowThreshold, aGoodThreshold);
CleanupStack::Pop(self);
return self;
}
@@ -56,10 +56,9 @@
//
// ---------------------------------------------------------
//
-COutOfMemoryWatcher::COutOfMemoryWatcher(CMemoryMonitor& aMonitor, TBool aSwapUsageMonitored)
+COutOfMemoryWatcher::COutOfMemoryWatcher(CMemoryMonitor& aMonitor)
: CActive(CActive::EPriorityStandard),
- iMemoryMonitor(aMonitor),
- iSwapUsageMonitored(aSwapUsageMonitored)
+ iLafShutdown(aMonitor)
{
FUNC_LOG;
@@ -70,33 +69,19 @@
//
// ---------------------------------------------------------
//
-void COutOfMemoryWatcher::ConstructL(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold)
+void COutOfMemoryWatcher::ConstructL(TInt aLowThreshold, TInt aGoodThreshold)
{
FUNC_LOG;
- UserSvr::SetMemoryThresholds(aLowRamThreshold,aGoodRamThreshold);
- if (iSwapUsageMonitored)
- {
- SVMSwapThresholds thresholds;
- thresholds.iLowThreshold = aLowSwapThreshold;
- thresholds.iGoodThreshold = aGoodSwapThreshold;
- UserSvr::HalFunction(EHalGroupVM, EVMHalSetSwapThresholds, &thresholds, 0);
- }
+ UserSvr::SetMemoryThresholds(aLowThreshold,aGoodThreshold);
User::LeaveIfError(iChangeNotifier.Create());
}
-void COutOfMemoryWatcher::UpdateThresholds(TInt aLowRamThreshold, TInt aGoodRamThreshold, TInt aLowSwapThreshold, TInt aGoodSwapThreshold)
+void COutOfMemoryWatcher::UpdateThresholds(TInt aLowThreshold, TInt aGoodThreshold)
{
FUNC_LOG;
- UserSvr::SetMemoryThresholds(aLowRamThreshold,aGoodRamThreshold);
- if (iSwapUsageMonitored)
- {
- SVMSwapThresholds thresholds;
- thresholds.iLowThreshold = aLowSwapThreshold;
- thresholds.iGoodThreshold = aGoodSwapThreshold;
- UserSvr::HalFunction(EHalGroupVM, EVMHalSetSwapThresholds, &thresholds, 0);
- }
+ UserSvr::SetMemoryThresholds(aLowThreshold,aGoodThreshold);
}
// ---------------------------------------------------------
@@ -143,7 +128,7 @@
// Check for memory status change.
if (status & EChangesFreeMemory)
{
- iMemoryMonitor.FreeMemThresholdCrossedL();
+ iLafShutdown.FreeMemThresholdCrossedL();
}
// We are not active until FreeMemThresholdCrossedL returns.
--- a/sysresmonitoring/oommonitor/src/oomrunplugin.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomrunplugin.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or 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,9 +21,6 @@
#include "oommonitorplugin.h"
#include "oompanic.h"
-#include <apgtask.h>
-#include <w32std.h>
-
COomRunPlugin* COomRunPlugin::NewL(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin)
{
FUNC_LOG;
@@ -37,40 +34,21 @@
// Run the OOM plugin in order to free memory
// Call the COomAction::MemoryFreed when it is done
-void COomRunPlugin::FreeMemory(TInt aBytesRequested, TBool aIsDataPaged)
+void COomRunPlugin::FreeMemory(TInt aBytesRequested)
{
FUNC_LOG;
- iFreeMemoryCalled = ETrue;
-
+ TRACES1("COomRunPlugin::FreeMemory: iPluginId = %x", iPluginId);
+
+ // Ask the plugin to free some memory
+
// Do we have a V2 plugin, if so then use it
if (iV2Plugin)
- {
- //RDebug::Printf("COomRunPlugin::FreeMemory: Requesting to free the RAM iV2Plugin->FreeRam(%d) \n",aBytesRequested);
iV2Plugin->FreeRam(aBytesRequested);
- }
- else if( aIsDataPaged )
- {
- if (IsAppDataPaged(iPlugin) )
- {
- //the plugins implemented by the application which are WDP enabled
- //are notified.
- //RDebug::Printf("COomRunPlugin::FreeMemory: Requesting to free the RAM to Data paged app \n");
- iPlugin.FreeRam();
- }
- else
- {
- //Request is for freeing the paged memory(swap) but the App(iPlugin belongs to)
- //is non WDP no need to notify; as it can't free the swap memory
- iFreeMemoryCalled = EFalse;
- return;
- }
- }
- else
- {
- //Unpaged memory will be freed in case of non WDP app
- //RDebug::Printf("COomRunPlugin::FreeMemory: Requesting to free the RAM \n");
+ else
+ // If we only have a V1 plugin then use that
iPlugin.FreeRam();
- }
+
+ iFreeMemoryCalled = ETrue;
// Wait for the required time before we signal completion.
__ASSERT_DEBUG(!iPluginWaiter->IsActive(), OomMonitorPanic(KStartingActivePluginWaiter));
@@ -116,50 +94,3 @@
iPluginWaiter = COomPluginWaiter::NewL(waitDuration, *this);
}
-
-//-----------------------------------------------------------------------------
-// Function: IsAppDataPaged
-// Checks whether the application which implements the given
-// COomMonitorPlugin is data paged
-//-----------------------------------------------------------------------------
-//
-TBool COomRunPlugin::IsAppDataPaged
- ( COomMonitorPlugin& aPlugin ) const
- {
- FUNC_LOG;
- /*
- /TRACES1("COomRunPlugin::IsAppDataPaged: aPlugin.AppId() = %x ", aPlugin.AppId() );
- //RDebug::Printf("COomRunPlugin::IsAppDataPaged: aPlugin.AppId() = %x ", aPlugin.AppId() );
- */
- //the function find the process with given appid and check
- //application supports the data paging.
- RProcess clientprocess;
- TApaTaskList taskList(aPlugin.WsSession());
- RThread clientthread;
- TInt err = clientthread.Open
- (taskList.FindApp(aPlugin.AppId()).ThreadId());
-
- //RDebug::Printf("COomRunPlugin::IsAppDataPaged: clientthread.Open() err = %d ", err );
-
- if( !err )
- {
- //getting the process which provides the plugin
- err = clientthread.Process(clientprocess);
- RDebug::Printf("COomRunPlugin::IsAppDataPaged: clientthread.Process() err = %d ", err );
-
- if( !err )
- {
- //checking whether the process is Data paged or not
- TBool isdatapaged = clientprocess.DefaultDataPaged();
- clientprocess.Close();
- clientthread.Close();
- //RDebug::Printf("COomRunPlugin::IsAppDataPaged: isdatapaged = %d ", isdatapaged );
-
- return isdatapaged;
- }
- clientthread.Close();
- }
- //could not successfully open the handle of process or thread,
- //the return EFalse
- return EFalse;
- }
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Wed Sep 15 12:23:15 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Wed Oct 13 14:43:04 2010 +0300
@@ -21,7 +21,7 @@
DEFAULT
PRJ_TESTEXPORTS
-../../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml
+../../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml
PRJ_TESTMMPFILES
--- a/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Wed Sep 15 12:23:15 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Wed Oct 13 14:43:04 2010 +0300
@@ -20,7 +20,7 @@
#include <avkon.rsg>
#include <gsaccsplugin.loc>
-#include <gsapp.rsg>
+#include <GSApp.rsg>
#include <uikon.rh>
#include "gsaccessoryplugin.hrh"
--- a/systemsettings/gssensorplugin/data/gssensorpluginrsc.rss Wed Sep 15 12:23:15 2010 +0300
+++ b/systemsettings/gssensorplugin/data/gssensorpluginrsc.rss Wed Oct 13 14:43:04 2010 +0300
@@ -22,12 +22,12 @@
#include <avkon.loc> // Avkon localized strings
#include <avkon.mbg>
#include <avkon.rsg>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <uikon.rh>
#include <eikon.rh>
#include <eikon.rsg>
#include <avkon.rh>
-#include <gsapp.rsg>
+#include <GSApp.rsg>
#include <gs.loc> // Common localized GS strings
#include <gscommon.rh> // Common GS resource structures
@@ -404,9 +404,7 @@
//
RESOURCE AVKON_VIEW r_gs_checkbox_view
{
- //cba = r_gs_sen_softkeys_ok_back__change; ou1cimx1#467503
- menubar = r_gs_sen_menubar_change_exit;
- cba =R_GS_SOFTKEYS_OPTIONS_BACK_CHANGE;
+ cba = r_gs_sen_softkeys_ok_back__change;
}
// *** SENSOR ACTIVE STATUS ***
--- a/systemsettings/gssensorplugin/group/gssensorplugin.mmp Wed Sep 15 12:23:15 2010 +0300
+++ b/systemsettings/gssensorplugin/group/gssensorplugin.mmp Wed Oct 13 14:43:04 2010 +0300
@@ -75,9 +75,9 @@
LIBRARY eikctl.lib // For checkbox icons
LIBRARY CommonEngine.lib // For RConeResourceLoader
-LIBRARY featmgr.lib // Feature manager
-LIBRARY centralrepository.lib // for CenRep
-LIBRARY AKNSKINS.lib // for enhanced skinning
+LIBRARY FeatMgr.lib // Feature manager
+LIBRARY CentralRepository.lib // for CenRep
+LIBRARY aknskins.lib // for enhanced skinning
LIBRARY hlplch.lib // for "Help" options menu
LIBRARY GSFramework.lib // For base classes
LIBRARY GSListBox.lib // For CGSListBoxItemTextArray
--- a/systemsettings/gssensorplugin/inc/gssenturnctrlview.h Wed Sep 15 12:23:15 2010 +0300
+++ b/systemsettings/gssensorplugin/inc/gssenturnctrlview.h Wed Oct 13 14:43:04 2010 +0300
@@ -71,11 +71,6 @@
* Checks currently activated item in list and updates MSK label if needed
*/
void CheckMiddleSoftkeyLabelL();
-
- /**
- * Deactivates current view.
- */
- void DoDeactivate();
private:
--- a/systemsettings/gssensorplugin/src/gssenturnctrlview.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/systemsettings/gssensorplugin/src/gssenturnctrlview.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -29,8 +29,6 @@
#include <gssensorpluginrsc.rsg>
#include <gscommon.hrh>
#include <eikbtgpc.h>
-#include <featmgr.h>
-#include <hlplch.h>
// ========================= MEMBER FUNCTIONS ================================
@@ -123,52 +121,24 @@
break;
}
case EGSCmdOk:
- case EAknSoftkeyBack:
- {
- // Check selections
+ // Check selections
Container()->CheckSelections();
// Store changes and show previous view
Container()->StoreSelectionsL();
// cont. to next case
+ case EAknSoftkeyBack:
+ {
// activate previous view
iAppUi->ActivateLocalViewL( KGSSensorPluginUid );
break;
}
- case EAknCmdHelp:
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- HlpLauncher::LaunchHelpApplicationL(
- iEikonEnv->WsSession(), iAppUi->AppHelpContextL() );
- }
- break;
- }
- case EGSSenMenuExit:
- {
- aCommand=EAknCmdExit;
- iAppUi->HandleCommandL( aCommand );
- break;
- }
-
default:
iAppUi->HandleCommandL( aCommand );
break;
}
TRACE_( "[GSSensorPlugin] CGSSenTurnCtrlView::HandleCommandL() - return" );
}
-// ---------------------------------------------------------------------------
-// CGSSenTurnCtrlView::DoDeactivate
-// Deactivates the current view
-// ---------------------------------------------------------------------------
-void CGSSenTurnCtrlView::DoDeactivate()
- {
- // Check selections
- Container()->CheckSelections();
- // Store changes and show previous view
- Container()->StoreSelectionsL();
- CGSSensorBaseView::DoDeactivate();
-
- }
+
// ---------------------------------------------------------------------------
// CGSSenTurnCtrlView::Container
// Returns call container item
--- a/tzservices/tzloc/inc/TzLocalizationDbAccessor.h Wed Sep 15 12:23:15 2010 +0300
+++ b/tzservices/tzloc/inc/TzLocalizationDbAccessor.h Wed Oct 13 14:43:04 2010 +0300
@@ -88,8 +88,10 @@
private:
TInt CreateFrequentlyUsedZoneTableL();
TInt CreateUserCityTableL();
+ TBool IsTableCreatedL(const TDesC& aTableName) const;
void CloseDb();
void OpenDbL();
+
protected:
//Member data
--- a/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp Wed Oct 13 14:43:04 2010 +0300
@@ -103,29 +103,21 @@
{
//Database file doesn't exist. Attempt to create a new one.
error = iLocalizedTimeZoneDb.Create(iDbsSession,KTzLocalizationDbName,KTzLocalizationDbSecurityPolicy);
- if (error == KErrNone)
- {
- User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
- User::LeaveIfError(CreateUserCityTableL());
- }
- }
- User::LeaveIfError(error);
- // Check if both tables are created.
- CDbColSet *colSet = NULL;
- TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KCZTableName));
- delete colSet;
- if (error)
- {
- User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
- }
- TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KUCTableName));
- delete colSet;
- if (error)
- {
- User::LeaveIfError(CreateUserCityTableL());
- }
+ User::LeaveIfError(error);
+
+ //Check whether tables exist and create them if they do not
+ if (!IsTableCreatedL(KCZTableName))
+ {
+ User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
+ }
+ if (!IsTableCreatedL(KUCTableName))
+ {
+ User::LeaveIfError(CreateUserCityTableL());
+ }
+ }
}
+
/**
Destructor
Closes the database tables, the database and the database session
@@ -142,7 +134,7 @@
iCityView.Close();
iZoneView.Close();
iLocalizedTimeZoneDb.Close();
- if (iZoneMutex.IsHeld()) // it is a leave, so release mutex
+ if (iZoneMutex.Handle() && iZoneMutex.IsHeld()) // it is a leave, so release mutex
{
iZoneMutex.Signal();
}
@@ -317,3 +309,24 @@
User::LeaveIfError(iZoneView.EvaluateAll());
}
+TBool CTzLocalizationDbAccessor::IsTableCreatedL(const TDesC& aTableName) const
+ {
+ TBool result = EFalse;
+ CDbTableNames* tableNames = iLocalizedTimeZoneDb.TableNamesL();
+ CleanupStack::PushL(tableNames);
+ if(tableNames)
+ {
+ const TInt count = tableNames->Count();
+ for(TInt i = 0; i < count; i++)
+ {
+ if((*tableNames)[i] == aTableName)
+ {
+ result = ETrue;
+ break;
+ }
+ }
+ }
+ CleanupStack::PopAndDestroy(tableNames);
+ return result;
+ }
+
--- a/tzservices/tzserver/Server/Source/tzlocalizationdb.cpp Wed Sep 15 12:23:15 2010 +0300
+++ b/tzservices/tzserver/Server/Source/tzlocalizationdb.cpp Wed Oct 13 14:43:04 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"
@@ -147,7 +147,7 @@
void CTzLocalizationDb::CloseDb()
{
iLocalizedTimeZoneDb.Close();
- if (iZoneMutex.IsHeld()) // it is a leave, so release mutex
+ if (iZoneMutex.Handle() && iZoneMutex.IsHeld()) // it is a leave, so release mutex
{
iZoneMutex.Signal();
}