# HG changeset patch # User srilekhas # Date 1287759770 -3600 # Node ID 20e07ff6040b761a38fb309241f415df13f37e7d # Parent 4610cd70c542ff61a461cabb510506c7ab030e25# Parent a2ddb8b15745be2edcedd528ea7aec307dfe255e Remerge fixes for Bug 2524, Bug 2414 (Symbian splashscreen and shutdown) diff -r a2ddb8b15745 -r 20e07ff6040b appfw/apparchitecture/aplist/aplapplist.cpp --- a/appfw/apparchitecture/aplist/aplapplist.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/appfw/apparchitecture/aplist/aplapplist.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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); diff -r a2ddb8b15745 -r 20e07ff6040b appsupport_plat/context_framework_services_api/inc/CFActionIndication.h --- a/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Fri Sep 17 16:14:46 2010 +0100 +++ b/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Fri Oct 22 16:02:50 2010 +0100 @@ -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 -#include +#include /** * Encapsulates inside an action indication. Action indication consists of diff -r a2ddb8b15745 -r 20e07ff6040b appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h --- a/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Fri Sep 17 16:14:46 2010 +0100 +++ b/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Fri Oct 22 16:02:50 2010 +0100 @@ -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); diff -r a2ddb8b15745 -r 20e07ff6040b appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h diff -r a2ddb8b15745 -r 20e07ff6040b appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h --- a/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h Fri Sep 17 16:14:46 2010 +0100 +++ b/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/src/cfclient/cfcontextservice.cpp --- a/contextframework/cfw/src/cfclient/cfcontextservice.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfw/src/cfclient/cfcontextservice.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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 bufferSizePtr( iRequestBufferSize ); diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h --- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.h Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -23,7 +23,7 @@ #include #include #include -#include +#include // INTERNAL INCLUDES diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h --- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.h Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -23,7 +23,7 @@ #include #include -#include +#include // INTERNAL INCLUDES diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/tsrc/public/basic/common/cffakeenv.h --- a/contextframework/cfw/tsrc/public/basic/common/cffakeenv.h Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/common/cffakeenv.h Fri Oct 22 16:02:50 2010 +0100 @@ -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 #include -#include +#include #include "cfextendedcontextinterface.h" #include "CFScriptEngineInterface.h" diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/tsrc/public/basic/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp --- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -30,7 +30,7 @@ #include "cfcontextobjectimpl.h" #include "CFContextQueryImpl.h" #include "CFContextSubscriptionImpl.h" -#include "cfkeyvaluepair.h" +#include "CFKeyValuePair.h" #include "cfserviceutils.h" #include "cfcontextdataproxy.h" #include "cfenvutils.h" diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp --- a/contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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); } diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp diff -r a2ddb8b15745 -r 20e07ff6040b contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp --- a/contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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 ) diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp --- a/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/GSServerEngine/Src/GSServerEngine.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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 +#include #include #include diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/GSRFSPluginRsc.rss diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/Rfs/inc/rfsConnectionObserver.h --- a/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Fri Oct 22 16:02:50 2010 +0100 @@ -26,7 +26,7 @@ #include #include -#include "rfsConTimer.h" +#include "rfscontimer.h" class CRfsConTimer; diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/Rfs/src/rfscontimer.cpp --- a/coreapplicationuis/Rfs/src/rfscontimer.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/Rfs/src/rfscontimer.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -17,7 +17,7 @@ */ -#include "rfsConTimer.h" +#include "rfscontimer.h" #include "RfsTraces.h" const TInt KRfsConnectionTimeOut = 60000000; diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Data/SysAp.rss diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Group/SysAp.mmp --- a/coreapplicationuis/SysAp/Group/SysAp.mmp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Inc/SysApAppUi.h --- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Fri Oct 22 16:02:50 2010 +0100 @@ -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; }; diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Inc/SysApFeatureManager.h --- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h --- a/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -28,7 +28,7 @@ #include #include #include // Remove this when SecondaryDisplayStartupAPI.h includes it properly. -#include +#include #include "SysApAppUi.h" diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Inc/sysapremconobserver.h --- a/coreapplicationuis/SysAp/Inc/sysapremconobserver.h Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Inc/sysapremconobserver.h Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp --- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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); } // ---------------------------------------------------------------------------- diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -59,7 +59,6 @@ #include #include -#include "sysapganhandler.h" #include #include #include @@ -248,8 +247,7 @@ iSysApAudioRoutingObserver( NULL ), iSysApCenRepCallForwardingObserver( NULL ), iSysApCenRepMsgWaitingObserver( NULL ), - iSysApGanHandler( NULL ), - iKeyBoardRepeatCount(-1) + iKeyBoardRepeatCount(-1) { TRACES( RDebug::Print( _L("CSysApAppUi::CSysApAppUi()") ) ); } @@ -492,15 +490,6 @@ 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() // ---------------------------------------------------------------------------- @@ -6854,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 ); } @@ -6937,10 +6866,15 @@ { iSysApPsmController->DoEnableFullPsm( ETrue ); } + + // Enabling Partial Psm when the user selects 'No' is diabled. + /* else { - iSysApPsmController->DoEnablePartialPsm( ETrue ); - } + //iSysApPsmController->DoEnablePartialPsm( ETrue ); // bhaskar + } + */ + } // ---------------------------------------------------------------------------- diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp --- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp --- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -718,7 +718,7 @@ if(iFmTxRemConObserver) { //Open Remcon and reserve the volume keys - iFmTxRemConObserver->StartRemconInterfaceL(); + iFmTxRemConObserver->StartRemconInterface(); } } else diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp --- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -22,7 +22,7 @@ #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION #include -#include +#include #include #include "SysApShutdownAnimation.h" @@ -172,6 +172,13 @@ else if ( iState == EPlaying ) { iState = EFinished; + if ( iCtrl ) + { + iCtrl->Cancel(); + iView.RemoveComponent(); + delete iCtrl; + iCtrl = NULL; + } iCallBack.CallBack(); } diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/gan/msysapganpropertyobserver.h --- a/coreapplicationuis/SysAp/Src/gan/msysapganpropertyobserver.h Fri Sep 17 16:14:46 2010 +0100 +++ /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_ */ diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/gan/sysapganhandler.cpp --- a/coreapplicationuis/SysAp/Src/gan/sysapganhandler.cpp Fri Sep 17 16:14:46 2010 +0100 +++ /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 -#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") ) ); - } - diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/gan/sysapganhandler.h --- a/coreapplicationuis/SysAp/Src/gan/sysapganhandler.h Fri Sep 17 16:14:46 2010 +0100 +++ /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 -#include -#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_ */ diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.cpp --- a/coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.cpp Fri Sep 17 16:14:46 2010 +0100 +++ /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; - } diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.h --- a/coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.h Fri Sep 17 16:14:46 2010 +0100 +++ /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 -#include -#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 diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp --- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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: diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/SysAp/Src/sysapremconobserver.cpp --- a/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -108,7 +108,7 @@ /** * Reserve the volume keys */ -void CSysApRemConObserver::StartRemconInterfaceL() +void CSysApRemConObserver::StartRemconInterface() { TRACES( RDebug::Print( _L("CSysApRemConObserver::BlockKeys"))); if(!iInterfaceSelector) diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp --- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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 ); diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/advancedtspcontroller/data/keyevent.rul --- a/coreapplicationuis/advancedtspcontroller/data/keyevent.rul Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/advancedtspcontroller/data/keyevent.rul Fri Oct 22 16:02:50 2010 +0100 @@ -105,6 +105,7 @@ - + - - - - - + /> diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/kefmapper/data/AknKeyEventMap.rss --- a/coreapplicationuis/kefmapper/data/AknKeyEventMap.rss Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/kefmapper/data/AknKeyEventMap.rss Fri Oct 22 16:02:50 2010 +0100 @@ -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 }; - } + } }; } diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp --- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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" ); } } diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/sensordatacompensatorplugin/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf diff -r a2ddb8b15745 -r 20e07ff6040b mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp --- a/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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(); diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/SplashScreen/inc/SplashScreen.h diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/SplashScreen/src/SplashScreen.cpp diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h --- a/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Fri Sep 17 16:14:46 2010 +0100 +++ b/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -23,7 +23,7 @@ #include #include #include -#include +#include // FORWARD DECLARATIONS diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp --- a/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -22,7 +22,7 @@ // SYSTEM INCLUDES #include #include -#include +#include #include #include diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/conf/startup.confml diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/conf/startup_101F8763.crml diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/inc/StartupAppUi.h --- a/startupservices/Startup/inc/StartupAppUi.h Fri Sep 17 16:14:46 2010 +0100 +++ b/startupservices/Startup/inc/StartupAppUi.h Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -36,9 +36,9 @@ #include #ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION - #include + #include #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -#include +#include // USER INCLUDES diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/inc/StartupWelcomeCrKeys.h --- a/startupservices/Startup/inc/StartupWelcomeCrKeys.h Fri Sep 17 16:14:46 2010 +0100 +++ /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 diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/src/StartupAppUi.cpp --- a/startupservices/Startup/src/StartupAppUi.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/startupservices/Startup/src/StartupAppUi.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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() diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/Startup/syserrcmd/src/syserrcmd.cpp --- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -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" @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/inc/StartupWelcomeCrKeys.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/startupservices/inc/StartupWelcomeCrKeys.h Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp --- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Fri Sep 17 16:14:46 2010 +0100 +++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Fri Oct 22 16:02:50 2010 +0100 @@ -24,7 +24,7 @@ #include #include #include "sanimengine.h" -#include +#include #include "sanimstartupctrl.h" #include "trace.h" diff -r a2ddb8b15745 -r 20e07ff6040b sysresmonitoring/oodmonitor/oodmonitor2/src/outofdisknotifyobserver.cpp diff -r a2ddb8b15745 -r 20e07ff6040b sysresmonitoring/oommonitor/bwins/oommonitorU.DEF --- a/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Fri Sep 17 16:14:46 2010 +0100 +++ b/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Fri Oct 22 16:02:50 2010 +0100 @@ -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 diff -r a2ddb8b15745 -r 20e07ff6040b sysresmonitoring/oommonitor/data/oomconfig.xml --- a/sysresmonitoring/oommonitor/data/oomconfig.xml Fri Sep 17 16:14:46 2010 +0100 +++ b/sysresmonitoring/oommonitor/data/oomconfig.xml Fri Oct 22 16:02:50 2010 +0100 @@ -1,5 +1,5 @@ - +