--- a/hapticsservices_plat/tactile_feedback_server_api/tsrc/inc/testdomtactilefeedbackserver.h Tue Feb 02 00:22:41 2010 +0200
+++ b/hapticsservices_plat/tactile_feedback_server_api/tsrc/inc/testdomtactilefeedbackserver.h Fri Mar 19 09:35:13 2010 +0200
@@ -91,20 +91,6 @@
* Method used to log version of test class
*/
void SendTestClassVersion();
-
- /*
- * Turn off ScreenSaver
- * @since S60 5.0
- * @return Symbian OS error code.
- */
- void TurnOffScreenSaver();
-
- /**
- * Restore ScreenSaver
- * @since S60 5.0
- * @return Symbian OS error code.
- */
- void RestoreScreenSaver();
private: // Data
--- a/hapticsservices_plat/tactile_feedback_server_api/tsrc/src/testdomtactilefeedbackserver.cpp Tue Feb 02 00:22:41 2010 +0200
+++ b/hapticsservices_plat/tactile_feedback_server_api/tsrc/src/testdomtactilefeedbackserver.cpp Fri Mar 19 09:35:13 2010 +0200
@@ -20,7 +20,6 @@
// INCLUDE FILES
#include <stiftestinterface.h>
#include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
#include <e32property.h>
#include "testdomtactilefeedbackserver.h"
@@ -101,8 +100,6 @@
EFalse );
SendTestClassVersion();
-
- TurnOffScreenSaver();
}
// -----------------------------------------------------------------------------
@@ -155,30 +152,4 @@
return ( CScriptBase* ) Ctestdomtactilefeedbackserver::NewL( aTestModuleIf );
}
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void Ctestdomtactilefeedbackserver::TurnOffScreenSaver()
- {
- TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- iOldScreenSaverProperty );
- TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- KScreenSaverAllowScreenSaver );
- RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n",
- iOldScreenSaverProperty, err1, err2 );
- }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void Ctestdomtactilefeedbackserver::RestoreScreenSaver()
- {
- RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- iOldScreenSaverProperty );
- User::ResetInactivityTime();
- }
-
-
// End of File
--- a/hapticsservices_pub/tactile_feedback_client_api/tsrc/inc/testsdktfc.h Tue Feb 02 00:22:41 2010 +0200
+++ b/hapticsservices_pub/tactile_feedback_client_api/tsrc/inc/testsdktfc.h Fri Mar 19 09:35:13 2010 +0200
@@ -88,20 +88,6 @@
* Method used to log version of test class
*/
void SendTestClassVersion();
-
- /**
- * Turn off ScreenSaver
- * @since S60 5.0
- * @return Symbian OS error code.
- */
- void TurnOffScreenSaver();
-
- /**
- * Restore ScreenSaver
- * @since S60 5.0
- * @return Symbian OS error code.
- */
- void RestoreScreenSaver();
//[TestMethods]
private:// for test the touchfeedback.h
--- a/hapticsservices_pub/tactile_feedback_client_api/tsrc/src/testsdktfc.cpp Tue Feb 02 00:22:41 2010 +0200
+++ b/hapticsservices_pub/tactile_feedback_client_api/tsrc/src/testsdktfc.cpp Fri Mar 19 09:35:13 2010 +0200
@@ -20,7 +20,6 @@
// INCLUDE FILES
#include <stiftestinterface.h>
#include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
#include <e32property.h>
#include "testsdktfc.h"
@@ -84,8 +83,6 @@
EFalse );
SendTestClassVersion();
-
- TurnOffScreenSaver();
}
// -----------------------------------------------------------------------------
@@ -150,31 +147,4 @@
return ( CScriptBase* ) CTestSDKTFC::NewL( aTestModuleIf );
}
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestSDKTFC::TurnOffScreenSaver()
- {
- //TInt Get(TUid aCategory, TUint aKey, TInt &aValue);
- TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- iOldScreenSaverProperty );
- TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- KScreenSaverAllowScreenSaver );
- RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n",
- iOldScreenSaverProperty, err1, err2 );
- }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestSDKTFC::RestoreScreenSaver()
- {
- RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- iOldScreenSaverProperty );
- User::ResetInactivityTime();
- }
-
-
// End of File
--- a/tacticonserver/server/tacticonpluginfw/inc/tacticonpluginfwuids.hrh Tue Feb 02 00:22:41 2010 +0200
+++ b/tacticonserver/server/tacticonpluginfw/inc/tacticonpluginfwuids.hrh Fri Mar 19 09:35:13 2010 +0200
@@ -16,4 +16,5 @@
*/
-#define ETacticonPlayerIFUID 0x2001FE50
\ No newline at end of file
+#define ETacticonPlayerIFUID 0x2001FE50
+
--- a/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/data/2001FE52.rss Tue Feb 02 00:22:41 2010 +0200
+++ b/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/data/2001FE52.rss Fri Mar 19 09:35:13 2010 +0200
@@ -41,4 +41,5 @@
};
}
-// End of file
\ No newline at end of file
+// End of file
+
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp Tue Feb 02 00:22:41 2010 +0200
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp Fri Mar 19 09:35:13 2010 +0200
@@ -108,6 +108,10 @@
{
User::LeaveIfError( iChunk.OpenGlobal( data.iChunkName, EFalse ) );
}
+ else if( err != KErrNone )
+ {
+ User::LeaveIfError( err );
+ }
// #3 Set window count to zero
TInt* chunkPtr = reinterpret_cast<TInt*>( iChunk.Base() );
@@ -121,6 +125,10 @@
{
User::LeaveIfError( iSemaphore.OpenGlobal( KTouchFeedbackSemaphore ) );
}
+ else if( err != KErrNone )
+ {
+ User::LeaveIfError( err );
+ }
// #5 Send chunk name to window server
TPckgC<TTactileFeedbackConnectData> dataPkg ( data );
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Tue Feb 02 00:22:41 2010 +0200
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Fri Mar 19 09:35:13 2010 +0200
@@ -973,7 +973,7 @@
if ( vibraEnabled || audioEnabled )
{
- TRACE4("CTouchFeedbackImpl::StartFeedback, type:=%d intensity:%d, timeout:%d", aType, aIntensity, aTimeout.Int());
+ TRACE4("CTouchFeedbackImpl::StartFeedback, type:=%d intensity:%d, timeout:%d", aType, aIntensity, aTimeout);
TUint32 clientHandle = ClientHandle( aControl );
iClient->StartFeedback( clientHandle,
aType,
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/data/20021339.rss Tue Feb 02 00:22:41 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/data/20021339.rss Fri Mar 19 09:35:13 2010 +0200
@@ -42,4 +42,5 @@
};
}
-// End of file
\ No newline at end of file
+// End of file
+
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/data/2001CB98.rss Tue Feb 02 00:22:41 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/data/2001CB98.rss Fri Mar 19 09:35:13 2010 +0200
@@ -42,4 +42,5 @@
};
}
-// End of file
\ No newline at end of file
+// End of file
+
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/data/2001CB9C.rss Tue Feb 02 00:22:41 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/data/2001CB9C.rss Fri Mar 19 09:35:13 2010 +0200
@@ -42,4 +42,5 @@
};
}
-// End of file
\ No newline at end of file
+// End of file
+
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/data/2001CB9A.rss Tue Feb 02 00:22:41 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/data/2001CB9A.rss Fri Mar 19 09:35:13 2010 +0200
@@ -42,4 +42,5 @@
};
}
-// End of file
\ No newline at end of file
+// End of file
+