htiui/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppControl.cpp
branchRCL_3
changeset 13 822c625f7adc
parent 11 454d022d514b
child 17 65b472535a0d
equal deleted inserted replaced
11:454d022d514b 13:822c625f7adc
    33 
    33 
    34 #include <SWInstApi.h>
    34 #include <SWInstApi.h>
    35 #include <swi/sisregistrysession.h>
    35 #include <swi/sisregistrysession.h>
    36 #include <swi/sisregistrypackage.h>
    36 #include <swi/sisregistrypackage.h>
    37 #include <javaregistryincludes.h>
    37 #include <javaregistryincludes.h>
    38 #include <widgetregistryclient.h>
    38 #include <WidgetRegistryClient.h>
    39 
    39 
    40 using namespace Java;
    40 using namespace Java;
    41 
    41 
    42 // CONSTANTS
    42 // CONSTANTS
    43 const static TUid KAppServiceUid = { 0x1020DEC7 }; //This is Uid of AppServiceOS
    43 const static TUid KAppServiceUid = { 0x1020DEC7 }; //This is Uid of AppServiceOS
   620 
   620 
   621                     iInstOpts.iDrive =        (TChar) parameters[offset]; offset++;
   621                     iInstOpts.iDrive =        (TChar) parameters[offset]; offset++;
   622                     iInstOpts.iLang =         (TLanguage) parameters[offset]; offset++;
   622                     iInstOpts.iLang =         (TLanguage) parameters[offset]; offset++;
   623                     iInstOpts.iUsePhoneLang = (TBool) parameters[offset]; offset++;
   623                     iInstOpts.iUsePhoneLang = (TBool) parameters[offset]; offset++;
   624                     iInstOpts.iUpgradeData =  ConvertToPolicy( parameters[offset] );
   624                     iInstOpts.iUpgradeData =  ConvertToPolicy( parameters[offset] );
   625 
   625                     offset++;
       
   626                     HTI_LOG_FORMAT( "parameters length: %d", parameters.Length());
       
   627                     HTI_LOG_FORMAT( "next offset: %d", offset);
       
   628 
       
   629                     if(parameters.Length() > offset)
       
   630                         {
       
   631                         TInt language = iInstOpts.iLang;
       
   632                         if (parameters.Length() == offset+2)
       
   633                             {
       
   634                             language = parameters[offset] + (parameters[offset+1]<<8);
       
   635                             }
       
   636                         if (parameters.Length() == offset+1)
       
   637                             {
       
   638                             language = parameters[offset];
       
   639                             }
       
   640                         if ((language > ELangTest) && (language < ELangMaximum))
       
   641                             {
       
   642                             iInstOpts.iLang =         (TLanguage) language;
       
   643                             }
       
   644                         }
   626                     HTI_LOG_FORMAT( "iDrive: %c",        iInstOpts.iDrive.GetLowerCase() );
   645                     HTI_LOG_FORMAT( "iDrive: %c",        iInstOpts.iDrive.GetLowerCase() );
   627                     HTI_LOG_FORMAT( "iLang: %d",         iInstOpts.iLang );
   646                     HTI_LOG_FORMAT( "iLang: %d",         iInstOpts.iLang );
   628                     HTI_LOG_FORMAT( "iUsePhoneLang: %d", iInstOpts.iUsePhoneLang );
   647                     HTI_LOG_FORMAT( "iUsePhoneLang: %d", iInstOpts.iUsePhoneLang );
   629                     HTI_LOG_FORMAT( "iUpgradeData: %d",  iInstOpts.iUpgradeData );
   648                     HTI_LOG_FORMAT( "iUpgradeData: %d",  iInstOpts.iUpgradeData );
   630 
   649 
  1556             }
  1575             }
  1557 
  1576 
  1558         offset += length; // skip over password
  1577         offset += length; // skip over password
  1559         offset += 4;      // the last one byte params
  1578         offset += 4;      // the last one byte params
  1560 
  1579 
  1561         if ( aParams.Length() != offset )
  1580         if ( aParams.Length() < offset || aParams.Length() > offset + 2)
  1562             {
  1581             {
  1563             HTI_LOG_TEXT( "ValidateInstallParams: Failed, final length incorrect" );
  1582             HTI_LOG_TEXT( "ValidateInstallParams: Failed, final length incorrect" );
  1564             return EFalse;
  1583             return EFalse;
  1565             }
  1584             }
  1566 
  1585