--- a/accessoryservices/accessoryserver/inc/Server/AccSrvServerModel.h Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/accessoryserver/inc/Server/AccSrvServerModel.h Tue Sep 14 23:45:36 2010 +0300
@@ -176,9 +176,9 @@
*
* @since S60 3.1
* @param aGenericID Generic ID of the detected accessory.
- * @return void
+ * @return index in the array
*/
- void RemovePhysicalConnection( const TAccPolGenericID& aGenericID );
+ TInt RemovePhysicalConnection( const TAccPolGenericID& aGenericID );
/**
* Get current connection status, ie. all active connections.
--- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -149,6 +149,9 @@
iAsyProxyCommsStack = 0;
}
+ iAsyComms.CloseSubSession();
+ iServer.Disconnect();
+ iServer.Close();
COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommsService::~CASYProxyCommsService" );
}
--- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -622,14 +622,16 @@
{
COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::PromoteToConnectedL()" );
- iServerModel->RemovePhysicalConnection( aGenericID ); //Move GID from physical connection array
- iServerModel->AddConnectionL( aGenericID ); //to connection array
+ if( KErrNotFound != iServerModel->RemovePhysicalConnection( aGenericID )) //Move GID from physical connection array
+ {
+ iServerModel->AddConnectionL( aGenericID ); //to connection array
- iNotificationQueue->CompleteControlMessageL( ENewAccessoryConnected,
- KErrNone,
- aGenericID.UniqueID() );
+ iNotificationQueue->CompleteControlMessageL( ENewAccessoryConnected,
+ KErrNone,
+ aGenericID.UniqueID() );
- iConnectionStatusHandler->IssueRequest();
+ iConnectionStatusHandler->IssueRequest();
+ }
COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::PromoteToConnectedL - return void" );
}
--- a/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -316,7 +316,7 @@
// CAccSrvServerModel::RemovePhysicalConnectionL
// -----------------------------------------------------------------------------
//
-void CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID )
+TInt CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID )
{
COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection()" );
@@ -329,7 +329,9 @@
iPhysicalConnectionArray.Remove( index );
}
- COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return void" );
+ COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return %d", index );
+
+ return index;
}
// -----------------------------------------------------------------------------
--- a/accessoryservices/accessoryserver/src/Server/AccSrvSubControl.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvSubControl.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -235,12 +235,18 @@
}
else
{
- err = notifier.StartNotifier( KAccFwUiNoteNotifierUid, KNullDesC8 );
- if ( err != KErrNone )
- {
- COM_TRACE_1( "[AccFW:AccServer] CAccSrvSubControl::ConnectAccessoryL - Couldn't start notifier: err = %d", err);
- }
- notifier.Close();
+ TPckg<TInt>iReplyPck(0);
+ TRequestStatus iStatus =KRequestPending;
+ notifier.StartNotifierAndGetResponse(iStatus,
+ KAccFwUiNoteNotifierUid,
+ KNullDesC8,iReplyPck);
+ User::WaitForRequest(iStatus);
+ err = iStatus.Int();
+ if(KErrNone != err)
+ {
+ COM_TRACE_1( "[AccFW:AccServer] CAccSrvSubControl::ConnectAccessoryL - Couldn't start notifier: err = %d", err);
+ }
+ notifier.Close();
}
}
else
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -192,7 +192,7 @@
{
hdmiSink = CAccPolHdmiSink::NewL(
iExtensionParserPtr->BasicAudio(),
- iTVOutConfigForHDMI.GetTvOutConfig()->CopyProtectionStatus() );
+ ETrue );
}
else
{
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -829,13 +829,13 @@
{
INFO( "Event: EIfAsyCommandHandlerEventSetCopyProtectionOn" );
TInt retVal = iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtection( ETrue );
- iHDMICableStatusFSM.CopyProtectionSettingDone( retVal );
+ iHDMICableStatusFSM.CopyProtectionSettingDone( retVal, iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtectionStatus() );
}
else if ( EIfAsyCommandHandlerEventSetCopyProtectionOff == aEvent )
{
INFO( "Event: EIfAsyCommandHandlerEventSetCopyProtectionOff" );
TInt retVal = iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtection( EFalse );
- iHDMICableStatusFSM.CopyProtectionSettingDone( retVal );
+ iHDMICableStatusFSM.CopyProtectionSettingDone( retVal, iTVOutConfigForCopyProtect->GetTvOutConfig()->CopyProtectionStatus() );
}
else if ( EIfAsyCommandHandlerEventGetCopyProtectStatus == aEvent )
{
--- a/devicesrv_pub/sensor_definitions_api/inc/sensrvilluminationsensor.h Wed Sep 01 12:34:26 2010 +0100
+++ b/devicesrv_pub/sensor_definitions_api/inc/sensrvilluminationsensor.h Tue Sep 14 23:45:36 2010 +0300
@@ -46,12 +46,17 @@
* Brighness constants for ambien light sensor data channel.
*/
static const TUint8 KAmbientLightVeryDark = 0;
- static const TUint8 KAmbientLightDark = 20;
+ static const TUint8 KAmbientLightDark = 20;
static const TUint8 KAmbientLightTwilight = 40;
static const TUint8 KAmbientLightLight = 60;
static const TUint8 KAmbientLightBright = 80;
+ static const TUint8 KAmbientLightCloudy = 85;
+ static const TUint8 KAmbientLightCloudySunny= 90;
static const TUint8 KAmbientLightSunny = 100;
+
+
+
/**
* Channel data type Id number
*/
--- a/sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h Wed Sep 01 12:34:26 2010 +0100
+++ b/sensorservices/tiltcompensationssy/inc/tcsendeventtimer.h Tue Sep 14 23:45:36 2010 +0300
@@ -72,8 +72,7 @@
// @see CActive
TInt RunError( TInt aError );
public:
- void Start( );
-
+ void Start(TInt aHrz );
private: // Private data for base channel
// The timer object
--- a/sensorservices/tiltcompensationssy/inc/tcstatetiltlistendata.h Wed Sep 01 12:34:26 2010 +0100
+++ b/sensorservices/tiltcompensationssy/inc/tcstatetiltlistendata.h Tue Sep 14 23:45:36 2010 +0300
@@ -173,9 +173,6 @@
// Pointer to the timer
CTCSendEventTimer* iTimerToSend;
- // Flag that states if the property has changed
- TBool iHasChanged;
-
// The requested amount of data
TInt iRequestedDataCount;
--- a/sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/sensorservices/tiltcompensationssy/src/tcsendeventtimer.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -75,8 +75,9 @@
User::LeaveIfError( ret );
iTimerToHzLevel = aSetTimerToHzLevel;
}
-void CTCSendEventTimer::Start()
+void CTCSendEventTimer::Start(TInt aHrz)
{
+ iTimerToHzLevel = aHrz;
TTimeIntervalMicroSeconds32 interval( KOneSecondInMicroSeconds / iTimerToHzLevel );
if( !IsActive() )
--- a/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp Wed Sep 01 12:34:26 2010 +0100
+++ b/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp Tue Sep 14 23:45:36 2010 +0300
@@ -280,7 +280,6 @@
{
property.iProperty.GetValue( iHzSamplingRate );
INFO_1( "Sampling rate changed to: %d", iHzSamplingRate );
- iHasChanged = ETrue;
HandleStateEntryL();
}
break;
@@ -355,19 +354,8 @@
if( !iTimerToSend )
{
iTimerToSend = CTCSendEventTimer::NewL( iHzSamplingRate, *this );
- iTimerToSend->Start();
}
- else if( iHasChanged )
- {
- delete iTimerToSend;
- iTimerToSend = NULL;
- iTimerToSend = CTCSendEventTimer::NewL( iHzSamplingRate, *this );
- iHasChanged = EFalse;
- }
- else
- {
- iTimerToSend->Start();
- }
+ iTimerToSend->Start(iHzSamplingRate);
}
// ----------------------------------------------------------------------------------
@@ -474,7 +462,7 @@
else
{
if( iTimerToSend )
- iTimerToSend->Start();
+ iTimerToSend->Start(iHzSamplingRate);
}
}
--- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Wed Sep 01 12:34:26 2010 +0100
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Tue Sep 14 23:45:36 2010 +0300
@@ -68,46 +68,46 @@
{
// prio 0xFFF1
r_cmd_publishswp,
+ // prio 0x7FF2
+ r_cmd_activitymonscreensaver, //RSHI-85E4P2
+ // prio 0x7FF1
+ r_cmd_screensaver, //RSHI-85E4P2
// prio 0x7EFF
- r_cmd_activitymonitor1,
+ r_cmd_activitymonlogs,
// prio 0x7EFE
r_cmd_logs,
// prio 0x7EFD
- r_cmd_activitymonitor2,
+ r_cmd_activitymonpbk2,
// prio 0x7EFC
r_cmd_pbk2,
// prio 0x7EFB
- r_cmd_activitymonitor3,
+ r_cmd_activitymonmce,
// prio 0x7EFA
r_cmd_mce,
// prio 0x7EF9
- r_cmd_activitymonitor4,
+ r_cmd_activitymonclock,
// prio 0x7EF8
r_cmd_clock, //ESLT-842J9W
// prio 0x7EF7
- r_cmd_activitymonitor5,
+ r_cmd_activitymonvideocenter,
// prio 0x7EF6
r_cmd_videocenter,
// prio 0x7EF5
- r_cmd_activitymonitor6,
+ r_cmd_activitymoniaupdatebg,
// prio 0x7EF4
r_cmd_iaupdatebg,
- // prio 0x7EF3
- r_cmd_activitymonitor7,
- // prio 0x7EF2
- r_cmd_screensaver,
// prio 0x7EEF
- r_cmd_activitymonitor8,
+ r_cmd_activitymonautosync,
// prio 0x7EEE
r_cmd_autosync
#ifdef FF_ATT_ADDRESS_BK
//prio 0x7EEA
- ,r_cmd_activitymonitor9,
+ ,r_cmd_activitymonaab,
//prio 0x7EE9
r_cmd_aab
#endif
// prio 0x7EE8
- ,r_cmd_activitymonitor10,
+ ,r_cmd_activitymoncalendar,
// prio 0x7EE7
r_cmd_calendar //CR:MMUN-82ZHAD
};
@@ -129,10 +129,10 @@
#endif
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor1
+// r_cmd_activitymonlogs
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor1
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonlogs
{
priority = 0x7EFF;
severity = ECmdCriticalSeverity;
@@ -144,10 +144,10 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor2
+// r_cmd_activitymonpbk2
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor2
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonpbk2
{
priority = 0x7EFD;
severity = ECmdCriticalSeverity;
@@ -159,10 +159,10 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor3
+// r_cmd_activitymonmce
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor3
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonmce
{
priority = 0x7EFB;
severity = ECmdCriticalSeverity;
@@ -174,10 +174,10 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor4
+// r_cmd_activitymonclock
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor4
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonclock
{
priority = 0x7EF9;
severity = ECmdCriticalSeverity;
@@ -189,10 +189,10 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor5
+// r_cmd_activitymonvideocenter
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor5
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonvideocenter
{
priority = 0x7EF7;
severity = ECmdCriticalSeverity;
@@ -204,10 +204,10 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor6
+// r_cmd_activitymoniaupdatebg
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor6
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymoniaupdatebg
{
priority = 0x7EF5;
severity = ECmdCriticalSeverity;
@@ -219,12 +219,12 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor7
+// r_cmd_activitymonscreensaver
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor7
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonscreensaver
{
- priority = 0x7EF3;
+ priority = 0x7FF2;
severity = ECmdCriticalSeverity;
execution_behaviour = ESsmWaitForSignal;
dllname = "ssmactivitycmd.dll";
@@ -234,10 +234,10 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor8
+// r_cmd_activitymonautosync
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor8
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonautosync
{
priority = 0x7EEF;
severity = ECmdCriticalSeverity;
@@ -249,11 +249,11 @@
}
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor9
+// r_cmd_activitymonaab
// ---------------------------------------------------------------------------
//
#ifdef FF_ATT_ADDRESS_BK
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonaab
{
priority = 0x7EEA;
severity = ECmdCriticalSeverity;
@@ -266,10 +266,10 @@
#endif
// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor10
+// r_cmd_activitymoncalendar
// ---------------------------------------------------------------------------
//
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymoncalendar
{
priority = 0x7EE8;
severity = ECmdCriticalSeverity;
@@ -386,7 +386,7 @@
//
RESOURCE SSM_START_APP_INFO r_cmd_screensaver
{
- priority = 0x7EF2;
+ priority = 0x7FF1;
name = "z:\\sys\\bin\\screensaver.exe";
background = 1; // To background
execution_behaviour = ESsmWaitForSignal;