FCL/sf/mw/appsupport: comparison coreapplicationuis/SysAp/Src/SysApAppUi.cpp

equal deleted inserted replaced

-:2e3d3ce01487
+:c4cbaa4fb734
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <hwrmpowerstatesdkpskeys.h>
 #include <hwrmdomainpskeys.h>
 #include <PSVariables.h>
-#include "CoreApplicationUIsPrivatePSKeys.h"
+#include "coreapplicationuisprivatepskeys.h"
 #include <ctsydomainpskeys.h>
 #include <startupdomainpskeys.h>
 #include <startupdomaincrkeys.h>
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include "sysapcenreplightsettingsobserver.h"
 #include "SysApCenRepLogsObserver.h"
 #include "SysApCenRepBTObserver.h"
 #include "SysApCenRepHacSettingObserver.h"
 #include "SysApCenRepController.h"
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
-#include "CoreApplicationUIsPrivatePSKeys.h"
+#include "coreapplicationuisprivatepskeys.h"
 #include <UikonInternalPSKeys.h>
 #include "SysApStartupController.h"
 #include "SysApConnectionMonitorObserver.h"
 #include "SysApPowerKeyMenuObserver.h"
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: START") ) );
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying BaseConstructL( EAknEnableSkin )") ) );
 BaseConstructL( EAknEnableSkin );
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: BaseConstructL() OK") ) );
-iFlagForRmvMmcFrmShortPwrKey = EFalse;
 /*SysAp is set as system application (Symbian terminology). This means some special privilege compared
 to other applications. For example it does not get closed when system is asked to close applications
 */
 iEikonEnv->SetSystem( ETrue );
 iSysApCenRepFmTxObserver = CSysApCenRepFmTxObserver::NewL( *this );
 }
 // Define P&S keys "owned" by SysAp
 RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
+//initially assuming that the memory card is not inserted
+RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
 TDriveInfo driveInfo;
 TInt driveNumber;
 TInt err;
 RFs& fileServer = iEikonEnv->FsSession();
 for ( driveNumber = EDriveD; driveNumber < EDriveZ; driveNumber++ )
 {
 	  err = fileServer.Drive(driveInfo,driveNumber);
-if(err == KErrNone && driveInfo.iType == EMediaHardDisk &&  driveInfo.iDriveAtt & KDriveAttRemovable)
+if(driveNumber == EDriveF && err == KErrNone && driveInfo.iType == EMediaHardDisk &&  driveInfo.iDriveAtt & KDriveAttRemovable)
 	{
 	TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: err = %d, driveInfo.iType = %d, driveInfo.iDriveAtt %d, KDriveAttRemovable = %d "),err,driveInfo.iType,driveInfo.iDriveAtt,KDriveAttRemovable) );
 	RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
 break;  // Memory card drive found...
 		}
 iInsertedMemoryCards[ aSelection - iPowerkeyMenuEjectSelectionBase ].iDrive;
 TRACES( RDebug::Print(
 _L( "CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Eject\" selected, drive=%d" ),
 iDriveToEject ) );
 iSysApDriveList->ResetDrivesToEject();
-iFlagForRmvMmcFrmShortPwrKey = ETrue;
 RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
 EjectMMCL();
 }
 #endif // RD_MULTIPLE_DRIVE
 else if ( iSysApPsmController && aSelection == iSysApPsmController->UiItemId() )
 {
 return EFalse;
 }
 }
+/**
+* To check the for an emergency call.
+*
+* @return ETrue if there is an emergency call active otherwise, EFalse.
+*/
+TBool IsEmergencyCall()
+{
+TBool retVal( EFalse );
+TInt err( KErrNone );
+TInt state( 0 );
+err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
+if ( err == KErrNone && state )
+{
+retVal = ETrue;
+}
+return retVal;
+}
 // ----------------------------------------------------------------------------
 // CSysApAppUi::HandleCurrentCallStateChangeL()
 // ----------------------------------------------------------------------------
 void CSysApAppUi::HandleCurrentCallStateChangeL( TInt aCurrentCallState )
 }
 switch ( aCurrentCallState )
 {
 case EPSCTsyCallStateRinging:
+{
 iSysApLightsController->CallComingInL( ETrue );
-// disable keylock when a call is coming in
+// Disable keylock when a call is coming in
 if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
 {
 TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
 iKeyLockOnBeforeCall = ETrue;
 KeyLock().DisableWithoutNote();
 }
 }
 }
 break;
+}
 case EPSCTsyCallStateDialling:
-// disable keylock during an emergency call
+{
+// Disable keypad lock during an emergency call
+// no need to disable the key lock when a call is made using the wireless car-kit
+// but if the call is an emergency one then we will disable the keypad lock
 if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
 {
 TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
 iKeyLockOnBeforeCall = ETrue;
-if ( iKeyLockEnabled || iDeviceLockEnabled )
+if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
 {
 KeyLock().DisableWithoutNote();
 }
 }
-// enable signal & network indicators when an emergency call is made in Offline Mode
+// Enable signal & network indicators when an emergency call is made in Offline Mode
 if( iSysApOfflineModeController->OfflineModeActive() )
 {
-if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP) // signal indicators not updated with VoIP call
+// Signal indicators not updated with VoIP call
+if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP)
 {
 iEmergencyCallActive = ETrue;
 UpdateSignalBarsL();
 SetSignalIndicatorL();
 }
 }
 break;
+}
 case EPSCTsyCallStateConnected:
+{
 if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
 {
-// check if GPRS suspended note is required
+// Check if GPRS suspended note is required
 iCallActivated = ETrue;
 HandleGprsNotesL();
 }
 if ( iDeviceLockEnabled )
 {
 // Enable keylock via autolock emulation if device lock enabled.
 // Otherwise e.g. messages can be read using softkeys during ongoing call.
 KeyLock().EnableAutoLockEmulation();
 }
 break;
+}
 case EPSCTsyCallStateNone:
-// reset timers in ScreenSaver and Autolock
+{
+// Reset timers in ScreenSaver and Autolock
 User::ResetInactivityTime();
 if ( iEmergencyCallActive )
 {
 iEmergencyCallActive = EFalse;
 ShowUiNoteL( EKeypadActiveNote );
 iShowkeypadActivatedNoteAfterSoftReject = EFalse;
 }
 iCallActivated = EFalse;
 break;
+}
 default:
 break;
 }
 if ( aCurrentCallState != EPSCTsyCallStateRinging )
 if ( aDrive == defaultMemoryCard )
 {
 if ( memoryCardStatus == ESysApMemoryCardInserted )
 {
-if(!iFlagForRmvMmcFrmShortPwrKey)
+RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-	{
+	}
-	RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-		}
-		iFlagForRmvMmcFrmShortPwrKey = EFalse;
-}
 else
 {
 RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
 }
 }

changeset 21	c4cbaa4fb734
parent 0	2e3d3ce01487
child 28	b0b858956ed5