--- a/speechsrv_plat/ui_voice_recognition_api/inc/vuivoicerecogdefs.h Thu Dec 17 08:46:30 2009 +0200
+++ b/speechsrv_plat/ui_voice_recognition_api/inc/vuivoicerecogdefs.h Mon Jan 18 20:20:30 2010 +0200
@@ -27,6 +27,7 @@
const TInt KMaxPhoneNumberLength = 48; // taken from Phonebook
const TInt KMaxNameLength = 110; // taken from Phonebook
+const TInt KMaxFieldLength = 150; // taken from Phonebook, EMail address length
const TInt KSindMaxResults = 6; // The number of voice tags needed for the N-Best List.
--- a/srsf/devasr/src/devasrrecognitionalgmgr.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/srsf/devasr/src/devasrrecognitionalgmgr.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -753,7 +753,7 @@
}
// Do not load empty lexicon
- if ( iSILexicon->Count() == 0 )
+ if ( iSILexicon && iSILexicon->Count() == 0 )
{
iSILexicon = NULL;
iRecAlgMgrObserver->LoadLexiconComplete( KErrArgument );
@@ -844,7 +844,7 @@
error = KErrArgument;
}
- if ( iSIModelBank->Count() < 1 )
+ if ( iSIModelBank && iSIModelBank->Count() < 1 )
{
iSIModelBank = NULL;
iRecAlgMgrObserver->LoadModelsComplete( KErrArgument );
--- a/srsf/nssvasapi/nssvasdb/src/nssvascvasdatabase.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/srsf/nssvasapi/nssvasdb/src/nssvascvasdatabase.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -403,6 +403,8 @@
RArray<TInt> tagIdArray;
+ ASSERT( aTagArray );
+
TInt arrayCount = aTagArray ? aTagArray->Count() : 0;
if( arrayCount == 0 )
{
--- a/srsf/nssvascontacthdlr/src/nssvasccontacthandler.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/srsf/nssvascontacthdlr/src/nssvasccontacthandler.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
-#include "NssVasCContactHandler.h"
+#include "nssvasccontacthandler.h"
#include "nssvasccontacthandlerimpl.h"
#include "rubydebug.h"
--- a/srsf/sisrscontrollerplugin/src/sicontrollerplugin.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/srsf/sisrscontrollerplugin/src/sicontrollerplugin.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -3343,10 +3343,13 @@
RUBY_DEBUG1( "CSIControllerPlugin::RunL. KAddVoiceTags. HandleLoadGrammarL Left with error [%d]", iResult );
// Clean up the iTrainArrays
- iTrainArrays->ResetAndDestroy();
- iTrainArrays->Close();
- delete iTrainArrays;
- iTrainArrays = NULL;
+ if ( iTrainArrays )
+ {
+ iTrainArrays->ResetAndDestroy();
+ iTrainArrays->Close();
+ delete iTrainArrays;
+ iTrainArrays = NULL;
+ }
// Send error message
iControllerIf.SendSrsEvent( KUidAsrEventAddVoiceTags, iResult );
}
--- a/srsf/vcommandmanager/src/vcmanagerapp.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/srsf/vcommandmanager/src/vcmanagerapp.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <e32std.h>
-#include <NssVasCContactHandler.h>
+#include <nssvasccontacthandler.h>
#include <eikstart.h>
#include "nssvoiceuipluginhandler.h"
#include "vcmanagerapp.h"
--- a/srsf/vcommandmanager/src/vcmanagerappui.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/srsf/vcommandmanager/src/vcmanagerappui.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -21,8 +21,8 @@
#include <akntitle.h>
#include <f32file.h>
#include <apgwgnam.h>
-#include <AknSgcc.h>
-#include <NssVasCContactHandler.h>
+#include <aknsgcc.h>
+#include <nssvasccontacthandler.h>
#include <data_caging_path_literals.hrh>
#include "nssvoiceuipluginhandler.h"
#include "rubydebug.h"
--- a/voiceui/vccontrolpanelplugin/inc/vccontrolpanelplugin.h Thu Dec 17 08:46:30 2009 +0200
+++ b/voiceui/vccontrolpanelplugin/inc/vccontrolpanelplugin.h Mon Jan 18 20:20:30 2010 +0200
@@ -18,11 +18,11 @@
#ifndef VCCONTROLPANELPLUGIN_H
#define VCCONTROLPANELPLUGIN_H
-#include <GSPluginInterface.h>
+#include <gsplugininterface.h>
#include <aknview.h>
-#include <ConeResLoader.h>
+#include <coneresloader.h>
#include <eikclb.h>
-#include <AknServerApp.h>
+#include <aknserverapp.h>
#include "vccontrolpanelpluginuids.hrh"
class CAknNavigationDecorator;
--- a/voiceui/voiceuivoicerecognition/src/vuiccontactresultsstate.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/voiceui/voiceuivoicerecognition/src/vuiccontactresultsstate.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -514,7 +514,7 @@
DataStorage().PbkHandler()->FindContactFieldL( aTag );
- TBufC<KMaxPhoneNumberLength> phoneNumber = DataStorage().PbkHandler()->TextL();
+ TBufC<KMaxFieldLength> phoneNumber = DataStorage().PbkHandler()->TextL();
type.Set( GetContactIconType( DataStorage().PbkHandler()->FieldTypeL() ) );
aBuffer.Zero();
--- a/voiceui/voiceuivoicerecognition/src/vuicglobalprogressdialog.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/voiceui/voiceuivoicerecognition/src/vuicglobalprogressdialog.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -315,6 +315,7 @@
// Don't set blank icon
if ( aIconId != KAknsIIDQgnStatBtBlank )
{
+ ASSERT ( iconId < KSindNumberOfIcons );
TRAP_IGNORE(
AknsUtils::CreateIconL( skin, aIconId, bitmap, mask, fileName,
KBitmapId[ iconId ], KMaskId[ iconId ] );
--- a/voiceui/voiceuivoicerecognition/src/vuickeygrabber.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/voiceui/voiceuivoicerecognition/src/vuickeygrabber.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -88,6 +88,9 @@
iWsSession.EventReady( &iStatus );
SetActive();
+ //fix for ESLI-7YSA3 we terminate Vcommand when received EKeyNull.
+ if ( event.Key()->iCode == EKeyNull )
+ iKeyObserver->HandleKeypressL( event.Key()->iCode );
if ( event.Key()->iCode == EKeyCamera ||
event.Key()->iCode == EKeyPoC ||
event.Key()->iCode == EKeyPowerOff ||
--- a/voiceui/voiceuivoicerecognition/src/vuicplaystate.cpp Thu Dec 17 08:46:30 2009 +0200
+++ b/voiceui/voiceuivoicerecognition/src/vuicplaystate.cpp Mon Jan 18 20:20:30 2010 +0200
@@ -167,7 +167,7 @@
if ( iInternalState == ENotStarted )
{
- TBuf<KMaxPhoneNumberLength> phoneNumber;
+ TBuf<KMaxFieldLength> phoneNumber;
TFieldType fieldType;
TName name;