--- a/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h Tue Sep 14 21:35:53 2010 +0300
+++ b/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h Wed Sep 15 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -263,6 +263,14 @@
*/
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/contextframework/cfw/group/bld.inf Tue Sep 14 21:35:53 2010 +0300
+++ b/contextframework/cfw/group/bld.inf Wed Sep 15 12:23:15 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/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Tue Sep 14 21:35:53 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Wed Sep 15 12:23:15 2010 +0300
@@ -23,7 +23,7 @@
#include <CEUnitTestSuiteClass.h>
#include <EUnitDecorators.h>
#include <f32file.h>
-#include <cfkeyvaluepair.h>
+#include <CFKeyValuePair.h>
// INTERNAL INCLUDES
--- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Tue Sep 14 21:35:53 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Wed Sep 15 12:23:15 2010 +0300
@@ -23,7 +23,7 @@
#include <CEUnitTestSuiteClass.h>
#include <f32file.h>
-#include <cfkeyvaluepair.h>
+#include <CFKeyValuePair.h>
// INTERNAL INCLUDES
--- a/contextframework/cfw/tsrc/public/basic/group/bld.inf Tue Sep 14 21:35:53 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/bld.inf Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -30,7 +30,7 @@
#include "cfcontextobjectimpl.h"
#include "CFContextQueryImpl.h"
#include "CFContextSubscriptionImpl.h"
-#include "cfkeyvaluepair.h"
+#include "CFKeyValuePair.h"
#include "cfserviceutils.h"
#include "cfcontextdataproxy.h"
#include "cfenvutils.h"
--- a/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp Tue Sep 14 21:35:53 2010 +0300
+++ b/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp Wed Sep 15 12:23:15 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/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/GSRFSPluginRsc.rss Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/GSRFSPluginRsc.rss Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Wed Sep 15 12:23:15 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/SysAp/Data/SysAp.rss Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/SysAp/Data/SysAp.rss Wed Sep 15 12:23:15 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/Inc/SysApMediatorObserver.h Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Wed Sep 15 12:23:15 2010 +0300
@@ -28,7 +28,7 @@
#include <MediatorCommandResponder.h>
#include <MediatorEventProvider.h>
#include <w32std.h> // Remove this when SecondaryDisplayStartupAPI.h includes it properly.
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include "SysApAppUi.h"
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -68,7 +68,7 @@
#include "SysApSimChanged.h"
-#include <SysAp.rsg>
+#include <sysap.rsg>
#include "SysApLightsController.h"
#include "SysApPubSubObserver.h"
@@ -490,7 +490,7 @@
TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL trying CSysApCenRepHacSettingObserver::NewL") ) );
iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this );
- DeactivatePSMifBatteryNotLowL ();
+
if( iSysApFeatureManager->GanSupported() )
{
@@ -4558,6 +4558,7 @@
InitializeStatusPaneAreaL();
CheckSilentModeL();
HandleAccessoryProfileInStartupL();
+ DeactivatePSMifBatteryNotLowL ();
if ( iSysApFeatureManager->MmcSupported() )
{
--- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -22,7 +22,7 @@
#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
#include <aknappui.h>
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include <startupdomaincrkeys.h>
#include "SysApShutdownAnimation.h"
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -258,9 +258,12 @@
reader.ReadTPtrC();
}
}
-
+
CleanupStack::PopAndDestroy(literals);
- CleanupStack::PushL(enhancement);
+
+ if(enhancement)
+ CleanupStack::PushL(enhancement);
+
}
if ( enhancementOk )
@@ -336,7 +339,9 @@
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default accessory text ready!" );
}
- CleanupStack::PopAndDestroy(enhancement);
+ if(enhancement)
+ CleanupStack::PopAndDestroy(enhancement);
+
// Pass string to member string and free local copies
CleanupStack::PopAndDestroy( defaultText );
CleanupStack::PushL( noteStr );
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Wed Sep 15 12:23:15 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/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Wed Sep 15 12:23:15 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/tsrc/rfspluginstest/secureformattertest/group/bld.inf Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Wed Sep 15 12:23:15 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/startupservices/SplashScreen/inc/SplashScreen.h Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/SplashScreen/inc/SplashScreen.h Wed Sep 15 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -49,6 +49,26 @@
};
/**
+* 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
@@ -80,8 +100,6 @@
RWindowGroup Group() {return iGroup;};
- TInt iPSRemoveSplashState;
-
protected:
TInt iLastScreenMode;
@@ -90,7 +108,6 @@
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 Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/SplashScreen/src/SplashScreen.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -200,27 +200,16 @@
/////////////////////////// CWsClient implementation ////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
CWsClient::CWsClient()
-: CActive(CActive::EPriorityStandard),
- iPSRemoveSplashState( ESplashRunning )
+: CActive(CActive::EPriorityStandard)
{
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());
@@ -253,8 +242,6 @@
TRACES("CWsClient::ConstructL(): About to start CActiveScheduler");
- CActiveScheduler::Start(); // start the active scheduler
-
TRACES("CWsClient::CWsClient(): End");
}
@@ -274,7 +261,6 @@
iGroup.Close();
// finish with window server
Cancel();
- iProperty.Close();
iWs.Close();
TRACES("CWsClient::~CWsClient(): End");
}
@@ -433,6 +419,79 @@
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 //
//////////////////////////////////////////////////////////////////////////////
@@ -509,72 +568,57 @@
{
TRACES("CSplashWsClient::RunL(): Start");
- TInt state;
- RProperty::Get( KPSUidStartup, KPSSplashShutdown, state );
- TRACES1("CSplashWsClient::RunL(): KPSSplashShutdown state = %d", state);
+ TRACES("CSplashWsClient::RunL(): WS event");
- if ( state != iPSRemoveSplashState )
- {
- TRACES("CSplashWsClient::RunL(): KPSSplashShutdown state has changed -> PS event");
- if ( state == ESplashShutdown )
- {
- TRACES("CSplashWsClient::RunL(): Exit requested");
- Exit();
- }
- }
- else
- {
- TRACES("CSplashWsClient::RunL(): WS event");
-
- // get the event
- iWs.GetEvent(iWsEvent);
- const TInt eventType = iWsEvent.Type();
+ // 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:
+ // 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:
+ {
+ const TInt currentScreenMode = iScreen->CurrentScreenMode();
+ TRACES2("CSplashWsClient::RunL() - EEventScreenDeviceChanged - iLastScreenMode: %d, currentScreenMode: %d", iLastScreenMode, currentScreenMode);
+ if ( iLastScreenMode != currentScreenMode )
{
- 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();
+ 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;
- }
- TRACES("CSplashWsClient::RunL() - EEventScreenDeviceChanged - done");
+ iLastScreenMode = currentScreenMode;
}
- break;
- default:
- TRACES("CSplashWsClient::RunL(): default");
- break;
- }
- IssueRequest(); // maintain outstanding request
+ TRACES("CSplashWsClient::RunL() - EEventScreenDeviceChanged - done");
+ }
+ break;
+ default:
+ TRACES("CSplashWsClient::RunL(): default");
+ break;
}
+ IssueRequest(); // maintain outstanding request
+
TRACES("CSplashWsClient::RunL(): End");
}
@@ -602,11 +646,14 @@
// 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
- CleanupStack::PopAndDestroy(); // destruct
-
+ CSplashShutdownWatcher *shutdownWatcher=CSplashShutdownWatcher::NewL();
+ CleanupStack::PushL(shutdownWatcher);
+ CActiveScheduler::Start(); // start the active scheduler
+ CleanupStack::PopAndDestroy(2, client); // destruct
TRACES("DoItL(): End");
}
--- a/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Wed Sep 15 12:23:15 2010 +0300
@@ -23,7 +23,7 @@
#include <MediatorCommandResponder.h>
#include <MediatorPluginBase.h>
#include <MediatorEventProvider.h>
-#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
+#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
// FORWARD DECLARATIONS
--- a/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -22,7 +22,7 @@
// SYSTEM INCLUDES
#include <MediatorDomainUIDs.h>
#include <startupdomainpskeys.h>
-#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
+#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
#include <avkondomainpskeys.h>
#include <coreapplicationuisdomainpskeys.h>
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 Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/Startup/inc/StartupAppUi.h Wed Sep 15 12:23:15 2010 +0300
@@ -36,9 +36,9 @@
#include <data_caging_path_literals.hrh>
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
+ #include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
// USER INCLUDES
@@ -699,6 +699,8 @@
TInt iCounryListIndex;
TTime iTime;
+ // AT command CFUN profile Change
+ TInt iAtcmdCfunProfileChange;
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
TBool iTouchScreenCalibSupport;
--- a/startupservices/Startup/src/StartupAppUi.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/Startup/src/StartupAppUi.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -1590,7 +1590,10 @@
TBool CStartupAppUi::DosInOfflineModeL()
{
TRACES("CStartupAppUi::DosInOfflineModeL()");
- if ( iOfflineModeSupported )
+
+ // 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) )
{
TRACES1("CStartupAppUi::DosInOfflineModeL(): iOfflineModeSupported == %d", iOfflineModeSupported );
return UiInOfflineMode();
@@ -1653,6 +1656,19 @@
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");
@@ -1703,6 +1719,18 @@
}
#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 Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -23,7 +23,7 @@
#include <aknSDData.h>
#include <data_caging_path_literals.hrh>
#include <featmgr.h>
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include <StringLoader.h>
#include <startup.rsg>
#include <stringresourcereader.h>
--- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -24,7 +24,7 @@
#include <Profile.hrh>
#include <ProfileEngineSDKCRKeys.h>
#include "sanimengine.h"
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include "sanimstartupctrl.h"
#include "trace.h"
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp Tue Sep 14 21:35:53 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp Wed Sep 15 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -153,10 +153,13 @@
TInt status = iOutOfDiskMonitor->GetDriveStatus(aDrive);
iOutOfDiskMonitor->SaveDriveStatus(aDrive, status, ETrue);
- iOutOfDiskMonitor->ShowGlobalQueryIfNeededL();
- NotifyDiskSpace(warningThreshold,
+ if(status == KErrNone)
+ {
+ iOutOfDiskMonitor->ShowGlobalQueryIfNeededL();
+ NotifyDiskSpace(warningThreshold,
criticalThreshold,
aDrive);
+ }
TRACES("COutOfDiskNotifyObserver::DiskAddedL: End");
}
--- a/sysresmonitoring/oommonitor/group/bld.inf Tue Sep 14 21:35:53 2010 +0300
+++ b/sysresmonitoring/oommonitor/group/bld.inf Wed Sep 15 12:23:15 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/tsrc/oomtest/stub/group/bld.inf Tue Sep 14 21:35:53 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Wed Sep 15 12:23:15 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 Tue Sep 14 21:35:53 2010 +0300
+++ b/systemsettings/gssensorplugin/data/gssensorpluginrsc.rss Wed Sep 15 12:23:15 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
--- a/systemsettings/gssensorplugin/group/gssensorplugin.mmp Tue Sep 14 21:35:53 2010 +0300
+++ b/systemsettings/gssensorplugin/group/gssensorplugin.mmp Wed Sep 15 12:23:15 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