--- a/iaupdate/IAD/api/client/inc/iaupdateclient.h Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/api/client/inc/iaupdateclient.h Tue May 25 12:50:16 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -64,7 +64,7 @@
*
* @since S60 v3.2
*/
- TInt Open( TBool aToBackground );
+ TInt Open();
/**
* Close releases the resources allocated by this class object.
@@ -76,6 +76,10 @@
*
* @since S60 v3.2
*/
+ TInt OpenToBackroundAsync( TRequestStatus& aStatus );
+
+ TInt ConnectToApp();
+
void Close();
@@ -168,7 +172,7 @@
private:
-
+
// These functions send the operation requests to the server.
TInt SendCheckUpdatesRequest( TInt aUpdateFunction,
@@ -185,6 +189,8 @@
void ConnectNewAppToBackgroundL( TUid aAppUid );
+ void StartNewAppToBackgroundL( TUid aAppUid, TRequestStatus& aStatus );
+
void ServerName(TName& aServerName, TUid aAppServerUid, TUint aServerDifferentiator);
TUint GenerateServerDifferentiatorAndName(TName& aServerName, TUid aAppServerUid);
@@ -198,6 +204,8 @@
TInt iOwnWgId;
+ TUint iDifferentiator;
+
TPtr8 iPtr1;
TPtr8 iPtr2;
TPtr8 iPtr3;
--- a/iaupdate/IAD/api/client/inc/iaupdatemanager.h Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/api/client/inc/iaupdatemanager.h Tue May 25 12:50:16 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -64,7 +64,12 @@
/**
* No operation is going on.
*/
- EIAUpdateIdle,
+ EIAUpdateIdle,
+ /**
+ * SWUpdate app start requested.
+ */
+
+ EIAUpdateStartServer,
/**
* Update check has been requested.
@@ -242,10 +247,17 @@
* Handles the application going into the background.
*/
void HandleLosingForeground();
-
+
+private:// new functions
+
+ void CheckUpdatesContinue();
+
+ void CopyUpdateParamsL( const CIAUpdateParameters& aUpdateParameters );
private: // data
+ CIAUpdateParameters* iUpdateParameters;
+
// Observer who will be informed about the completion of the operations.
MIAUpdateObserver& iObserver;
--- a/iaupdate/IAD/api/client/src/iaupdateclient.cpp Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/api/client/src/iaupdateclient.cpp Tue May 25 12:50:16 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -46,22 +46,15 @@
//
// -----------------------------------------------------------------------------
//
-TInt RIAUpdateClient::Open( TBool aToBackground )
+TInt RIAUpdateClient::Open()
{
IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::Open() begin");
TInt error( KErrNone );
if ( !iConnected )
{
- if ( aToBackground )
- {
- TRAP( error, ConnectNewAppToBackgroundL( ServiceUid() ) );
- }
- else
- {
- TRAP( error, ConnectNewAppL( ServiceUid() ) );
- }
- if ( error == KErrNone )
+ TRAP( error, ConnectNewAppL( ServiceUid() ) );
+ if ( error == KErrNone )
{
iConnected = ETrue;
CEikonEnv* eikEnv = CEikonEnv::Static();
@@ -77,17 +70,71 @@
TIpcArgs args;
args.Set( 0, iData );
-
- SendReceive( IAUpdateClientDefines::EIAUpdateServerSendWgId, args );
- }
+ SendReceive( IAUpdateClientDefines::EIAUpdateServerSendWgId, args );
+ }
}
}
- IAUPDATE_TRACE_1("[IAUPDATE] error code: %d", error );
- IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::Open() begin");
+ IAUPDATE_TRACE_1("[IAUPDATE] RIAUpdateClient::Open() end error code: %d", error );
+ return error;
+ }
+
+// -----------------------------------------------------------------------------
+// RIAUpdateClient::OpenToBackroundAsync
+//
+// -----------------------------------------------------------------------------
+//
+TInt RIAUpdateClient::OpenToBackroundAsync( TRequestStatus& aStatus )
+ {
+ IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::OpenToBackroundAsync() begin");
+ TInt error( KErrNone );
+ if ( !iConnected )
+ {
+ TRAP( error, StartNewAppToBackgroundL( ServiceUid(), aStatus ) );
+ }
+ IAUPDATE_TRACE_1("[IAUPDATE] RIAUpdateClient::OpenToBackroundAsync() end error code: %d", error );
return error;
}
// -----------------------------------------------------------------------------
+// RIAUpdateClient::ConnectToApp
+//
+// -----------------------------------------------------------------------------
+//
+TInt RIAUpdateClient::ConnectToApp()
+ {
+ IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::ConnectToApp() begin");
+ TInt error( KErrNone );
+ TName serverName;
+ ServerName(serverName, ServiceUid(), iDifferentiator);
+ TRAP( error,ConnectExistingByNameL( serverName ) );
+
+ if ( error == KErrNone )
+ {
+ iConnected = ETrue;
+ CEikonEnv* eikEnv = CEikonEnv::Static();
+ if ( eikEnv )
+ {
+ RWindowGroup owngroup;
+ iOwnWgId = eikEnv->RootWin().Identifier();
+
+ TPckg<TInt> wgId( iOwnWgId );
+ delete iData;
+ iData = NULL;
+ TRAP_IGNORE( iData = wgId.AllocL() );
+
+ TIpcArgs args;
+ args.Set( 0, iData );
+ SendReceive( IAUpdateClientDefines::EIAUpdateServerSendWgId, args );
+ }
+ }
+ IAUPDATE_TRACE_1("[IAUPDATE] RIAUpdateClient::ConnectToApp() end error code: %d", error );
+ return error;
+ }
+
+
+
+
+// -----------------------------------------------------------------------------
// RIAUpdateClient::Close
//
// -----------------------------------------------------------------------------
@@ -307,40 +354,38 @@
return error;
}
-void RIAUpdateClient::ConnectNewAppToBackgroundL( TUid aAppUid )
+// -----------------------------------------------------------------------------
+// RIAUpdateClient::StartNewAppToBackgroundL
+//
+// -----------------------------------------------------------------------------
+//
+void RIAUpdateClient::StartNewAppToBackgroundL( TUid aAppUid, TRequestStatus& aStatus )
{
+ IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::StartNewAppToBackgroundL() begin");
TName notUsed;
- const TUint differentiator = GenerateServerDifferentiatorAndName(notUsed, aAppUid);
- TRequestStatus requestStatusForRendezvous;
-
+ iDifferentiator = GenerateServerDifferentiatorAndName(notUsed, aAppUid);
+
RApaLsSession apa;
User::LeaveIfError(apa.Connect());
CleanupClosePushL(apa);
-
+
TApaAppInfo info;
User::LeaveIfError(apa.GetAppInfo(info, aAppUid));
-
+
CApaCommandLine* cmdLine = CApaCommandLine::NewLC();
cmdLine->SetExecutableNameL(info.iFullName);
- cmdLine->SetServerRequiredL( differentiator );
+ cmdLine->SetServerRequiredL( iDifferentiator );
cmdLine->SetCommandL(EApaCommandBackground);
-
+
TThreadId notUsedId;
- User::LeaveIfError(apa.StartApp(*cmdLine, notUsedId, &requestStatusForRendezvous));
-
+ User::LeaveIfError(apa.StartApp(*cmdLine, notUsedId, &aStatus));
+
CleanupStack::PopAndDestroy(2, &apa); // cmdLine and apa
-
- User::WaitForRequest(requestStatusForRendezvous);
- User::LeaveIfError(requestStatusForRendezvous.Int());
-
- TName serverName;
- ServerName(serverName, aAppUid, differentiator);
- ConnectExistingByNameL(serverName);
+ IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::StartNewAppToBackgroundL() end");
}
-
void RIAUpdateClient::ServerName(TName& aServerName, TUid aAppServerUid, TUint aServerDifferentiator)
{
_LIT(KServerNameFormat, "%08x_%08x_AppServer");
--- a/iaupdate/IAD/api/client/src/iaupdatemanager.cpp Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/api/client/src/iaupdatemanager.cpp Tue May 25 12:50:16 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -22,6 +22,7 @@
#include <eikenv.h>
#include <iaupdateobserver.h>
#include <iaupdateresult.h>
+#include <iaupdateparameters.h>
#include "iaupdatemanager.h"
#include "iaupdateclient.h"
@@ -95,6 +96,8 @@
CIAUpdateManager::~CIAUpdateManager()
{
IAUPDATE_TRACE("[IAUPDATE] CIAUpdateManager::~CIAUpdateManager() begin");
+ delete iUpdateParameters;
+ iUpdateParameters = NULL;
// If an operation is still active,
// then DoCancel will cancel ongoing request
Cancel();
@@ -130,19 +133,19 @@
// Reset result values because we are starting a new operation.
ResetResults();
- // Set the update type.
- // So, we know later in RunL what operation was requested.
- SetUpdateType( EIAUpdateCheck );
-
- TInt error( UpdateClient().Open( ETrue) );
+ //
+ delete iUpdateParameters;
+ iUpdateParameters = NULL;
+ TInt error = KErrNone;
+ TRAP(error,CopyUpdateParamsL( aUpdateParameters ) );
if ( error == KErrNone )
- {
- error =
- UpdateClient().CheckUpdates( aUpdateParameters,
- iSuccessCount,
- iStatus );
- }
-
+ {
+ // Set the update type.
+ // So, we know later in RunL what operation was requested.
+ SetUpdateType( EIAUpdateStartServer );
+ error = UpdateClient().OpenToBackroundAsync( iStatus);
+ }
+
if ( error == KErrNone )
{
// Set this object active.
@@ -199,7 +202,7 @@
// So, we know later in RunL what operation was requested.
SetUpdateType( EIAUpdateUpdate );
- TInt error( UpdateClient().Open( EFalse ) );
+ TInt error( UpdateClient().Open() );
if ( error == KErrNone )
{
error =
@@ -280,7 +283,7 @@
// So, we know later in RunL what operation was requested.
SetUpdateType( EIAUpdateQuery );
- TInt error( UpdateClient().Open( EFalse ) );
+ TInt error( UpdateClient().Open() );
if ( error == KErrNone )
{
error =
@@ -383,6 +386,18 @@
// function to call.
switch ( updateType )
{
+ case EIAUpdateStartServer:
+ if ( errorCode == KErrNone )
+ {
+ CheckUpdatesContinue();
+ }
+ else
+ {
+ UpdateClient().Close();
+ Observer().CheckUpdatesComplete( errorCode, 0);
+ }
+ break;
+
case EIAUpdateCheck:
if ( iSuccessCount == 0 )
{
@@ -522,8 +537,71 @@
{
}
+// -----------------------------------------------------------------------------
+// CIAUpdateManager::CheckUpdatesContinue
+//
+// -----------------------------------------------------------------------------
+//
+void CIAUpdateManager::CheckUpdatesContinue()
+ {
+ IAUPDATE_TRACE("[IAUPDATE] CIAUpdateManager::CheckUpdatesContinue() begin");
+ TInt error = KErrNone;
+ SetUpdateType( EIAUpdateCheck );
+ error = UpdateClient().ConnectToApp();
+ if ( error == KErrNone )
+ {
+ error = UpdateClient().CheckUpdates( *iUpdateParameters,
+ iSuccessCount,
+ iStatus );
+ }
+
+ if ( error == KErrNone )
+ {
+ // Set this object active.
+ // Because everything went ok,
+ // the operation will be handled asynchronously
+ // and the service provider will inform us when the operation
+ // is finished.
+ SetActive();
+ }
+ else
+ {
+ // Because we are going to activate this active object,
+ // set the status pending.
+ iStatus = KRequestPending;
+
+ // An error occurred above.
+ // Therefore, the operation did not proceed any further.
+ // Set this object active for asynchronous error handling.
+ SetActive();
+
+ // Now, that everything is ready, just inform the active scheduler
+ // that operation is finished. Pass the error code for the observer.
+ TRequestStatus* status( &iStatus );
+ User::RequestComplete( status, error );
+ }
+ IAUPDATE_TRACE("[IAUPDATE] CIAUpdateManager::CheckUpdatesContinue() end");
+ }
+
+// -----------------------------------------------------------------------------
+// CIAUpdateManager::CopyUpdateParamsL
+//
+// -----------------------------------------------------------------------------
+//
+void CIAUpdateManager::CopyUpdateParamsL( const CIAUpdateParameters& aUpdateParameters )
+ {
+ IAUPDATE_TRACE("[IAUPDATE] CIAUpdateManager::CopyUpdateParamsL() begin");
+ iUpdateParameters = CIAUpdateParameters::NewL();
+ iUpdateParameters->SetCommandLineArgumentsL( aUpdateParameters.CommandLineArguments() );
+ iUpdateParameters->SetCommandLineExecutableL( aUpdateParameters.CommandLineExecutable() );
+ iUpdateParameters->SetImportance( aUpdateParameters.Importance() );
+ iUpdateParameters->SetRefresh( aUpdateParameters.Refresh() );
+ iUpdateParameters->SetSearchCriteriaL( aUpdateParameters.SearchCriteria() );
+ iUpdateParameters->SetShowProgress( aUpdateParameters.ShowProgress() );
+ iUpdateParameters->SetType( aUpdateParameters.Type() );
+ iUpdateParameters->SetUid( aUpdateParameters.Uid() );
+ IAUPDATE_TRACE("[IAUPDATE] CIAUpdateManager::CopyUpdateParamsL() end");
+ }
-
-
--- a/iaupdate/IAD/backgroundchecker/group/bld.inf Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/backgroundchecker/group/bld.inf Tue May 25 12:50:16 2010 +0300
@@ -25,9 +25,6 @@
PRJ_EXPORTS
-/epoc32/s60/icons/qgn_note_swupdate_notification.svg /epoc32/release/winscw/udeb/z/private/200211f4/qgn_note_swupdate_notification.svg
-/epoc32/s60/icons/qgn_note_swupdate_notification.svg /epoc32/release/winscw/urel/z/private/200211f4/qgn_note_swupdate_notification.svg
-/epoc32/s60/icons/qgn_note_swupdate_notification.svg /epoc32/data/z/private/200211f4/qgn_note_swupdate_notification.svg
PRJ_MMPFILES
./iaupdatebg.mmp
--- a/iaupdate/IAD/backgroundchecker/src/iaupdatebgrefreshtimer.cpp Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/backgroundchecker/src/iaupdatebgrefreshtimer.cpp Tue May 25 12:50:16 2010 +0300
@@ -47,7 +47,7 @@
_LIT8( KRefreshFromNetworkDenied, "1" );
_LIT(KIAUpdateResourceFile, "iaupdate.rsc");
_LIT(KIAUpdateLauncherExe, "iaupdatelauncher.exe" );
-_LIT(KImageFile, "qgn_note_swupdate_notification.svg");
+//_LIT(KImageFile, "qgn_note_swupdate_notification.svg");
//CONSTANTS
const TUint KIADUpdateLauncherUid( 0x2001FE2F );
@@ -1483,6 +1483,9 @@
iMode = ModeL();
+/*
+ // Commented out, so no icon is shown in the soft notification.
+ // Other functions, used by the code below, are also commented out.
if ( iMode == ENormalMode )
{
TFileName path;
@@ -1495,6 +1498,7 @@
CleanupStack::PopAndDestroy( image );
}
}
+*/
iSoftNotification->SetTextL( *text, *text );
@@ -1509,8 +1513,9 @@
// ----------------------------------------------------------
// CIAUpdateBGTimer::GetPrivatePathL()
// ----------------------------------------------------------
-TInt CIAUpdateBGTimer::GetPrivatePathL( TFileName& aPath )
+TInt CIAUpdateBGTimer::GetPrivatePathL( TFileName& /*aPath*/ )
{
+/*
RFs fsSession;
User::LeaveIfError( fsSession.Connect() );
CleanupClosePushL( fsSession );
@@ -1531,13 +1536,16 @@
CleanupStack::PopAndDestroy( &fsSession );
return err;
+*/
+ return 0;
}
// ----------------------------------------------------------
// CIAUpdateBGTimer::LoadFileLC()
// ----------------------------------------------------------
- HBufC8* CIAUpdateBGTimer::LoadFileLC(const TDesC& aFile)
+ HBufC8* CIAUpdateBGTimer::LoadFileLC(const TDesC& /*aFile*/)
{
+/*
RFs fs;
User::LeaveIfError( fs.Connect() );
CleanupClosePushL( fs );
@@ -1553,6 +1561,8 @@
CleanupStack::PopAndDestroy( &fs );
CleanupDeletePushL(imagebuf);
return imagebuf;
+*/
+ return NULL;
}
@@ -1560,9 +1570,10 @@
// CIAUpdateBGTimer::SetPrivateDriveL()
// ----------------------------------------------------------
void CIAUpdateBGTimer::SetPrivateDriveL(
- RFs& aFs,
- const TDesC& aFileName ) const
+ RFs& /*aFs*/,
+ const TDesC& /*aFileName*/ ) const
{
+/*
// First try to find the file from the private directory
// of the drive where the process exists.
RProcess process;
@@ -1611,6 +1622,7 @@
// Update the session path for the correct file.
SetSessionPrivatePathL( aFs, finder.File() );
+*/
}
@@ -1618,9 +1630,10 @@
// CIAUpdateBGTimer::SetSessionPrivatePathL()
// ----------------------------------------------------------
TInt CIAUpdateBGTimer::SetSessionPrivatePathL(
- RFs& aFs,
- const TDesC& aPath ) const
+ RFs& /*aFs*/,
+ const TDesC& /*aPath*/ ) const
{
+/*
// Use the parser to get the drive information from the path.
TParsePtrC parser( aPath );
@@ -1641,6 +1654,8 @@
User::LeaveIfError( aFs.SetSessionToPrivate( driveNum ) );
return driveNum;
+*/
+ return 0;
}
// ----------------------------------------------------------
--- a/iaupdate/IAD/firmwareupdate/group/iaupdatefwupdate.mmp Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/firmwareupdate/group/iaupdatefwupdate.mmp Tue May 25 12:50:16 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -48,39 +48,13 @@
LIBRARY euser.lib
-LIBRARY eikcoctl.lib
LIBRARY avkon.lib
LIBRARY centralrepository.lib
LIBRARY SyncMLClientAPI.lib
-LIBRARY esock.lib
LIBRARY fotaengine.lib
-LIBRARY http.lib
-LIBRARY bafl.lib
-LIBRARY inetprotutil.lib
-LIBRARY commdb.lib
-LIBRARY CommonEngine.lib
-LIBRARY efsrv.lib
-LIBRARY etel3rdparty.lib
LIBRARY ConnMon.lib
-LIBRARY xmlframework.lib
-LIBRARY cone.lib
LIBRARY sysutil.lib
-LIBRARY eikdlg.lib
-LIBRARY aknnotify.lib
-LIBRARY eiksrv.lib
-LIBRARY apgrfx.lib
-LIBRARY apparc.lib
-LIBRARY apsettingshandlerui.lib
-LIBRARY apengine.lib
-LIBRARY eikcore.lib
-LIBRARY ConnectionUiUtilities.lib
LIBRARY nsmltransporthandler.lib
-LIBRARY nsmltransport.lib
-LIBRARY nsmlhistorylog.lib
-LIBRARY syncservice.lib
-LIBRARY sysversioninfo.lib
-LIBRARY aknskins.lib
-LIBRARY eikctl.lib
LIBRARY cmmanager.lib
LIBRARY commonengine.lib
DEBUGLIBRARY flogger.lib
--- a/iaupdate/IAD/ui/src/iaupdateroaminghandler.cpp Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/ui/src/iaupdateroaminghandler.cpp Tue May 25 12:50:16 2010 +0300
@@ -115,7 +115,10 @@
//
void CIAUpdateRoamingHandler::CancelPreparing()
{
- iNwReg->Cancel();
+ if ( iNwReg )
+ {
+ iNwReg->Cancel();
+ }
}
--- a/iaupdate/IAD/ui/src/iaupdatestarter.cpp Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/IAD/ui/src/iaupdatestarter.cpp Tue May 25 12:50:16 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -108,8 +108,7 @@
UidForExecutableL( iUid );
if ( iUid.iUid == 0 )
{
- iStarterObserver->StartExecutableCompletedL( KErrNotFound );
- iStarterObserver = NULL;
+ LaunchExeL();
}
else
{
--- a/iaupdate/rom/iaupdate.iby Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/rom/iaupdate.iby Tue May 25 12:50:16 2010 +0300
@@ -41,13 +41,17 @@
file=ABI_DIR\BUILD_DIR\iaupdatebg.exe SHARED_LIB_DIR\iaupdatebg.exe
file=ABI_DIR\BUILD_DIR\iaupdatefwupdate.dll SHARED_LIB_DIR\iaupdatefwupdate.dll
+#ifdef _IMAGE_TYPE_RND
+data=ZPRIVATE\2000F85A\iaupdateengineconfig_testing.xml PRIVATE\2000F85A\iaupdateengineconfig.xml
+#else
data=ZPRIVATE\2000F85A\iaupdateengineconfig.xml PRIVATE\2000F85A\iaupdateengineconfig.xml
+#endif //_IMAGE_TYPE_RND
+
data=ZPRIVATE\2000F85A\backup_registration.xml PRIVATE\2000F85A\backup_registration.xml
data=ZSYSTEM\install\iaupdate_stub.sis system\install\iaupdate_stub.sis
data=ZSYSTEM\install\iaupdater_stub.sis system\install\iaupdater_stub.sis
-data= ZPRIVATE\200211f4\qgn_note_swupdate_notification.svg PRIVATE\200211f4\qgn_note_swupdate_notification.svg
#endif //FF_IAUPDATE
--- a/iaupdate/rom/iaupdate_stub.pkg Tue May 11 16:20:28 2010 +0300
+++ b/iaupdate/rom/iaupdate_stub.pkg Tue May 25 12:50:16 2010 +0300
@@ -46,7 +46,6 @@
""-"z:\resource\apps\iaupdate_aif.mif"
""-"z:\resource\apps\iaupdate.mif"
""-"z:\resource\apps\iaupdatelauncher_aif.mif"
-""-"z:\private\200211f4\qgn_note_swupdate_notification.svg"
;Other Files
""-"z:\private\2000F85A\iaupdateengineconfig.xml"
--- a/installationservices/swi/group/sisregistryserver_legacy.mmp Tue May 11 16:20:28 2010 +0300
+++ b/installationservices/swi/group/sisregistryserver_legacy.mmp Tue May 25 12:50:16 2010 +0300
@@ -29,8 +29,6 @@
// minimum 4KB maximum 2MB (twice the maximum default)
EPOCHEAPSIZE 0x1000 0x200000
-epocprocesspriority low
-
target sisregistryserver.exe
targettype exe
--- a/installationservices/swi/source/sisregistry/server_legacy/siscontrollerverifier.cpp Tue May 11 16:20:28 2010 +0300
+++ b/installationservices/swi/source/sisregistry/server_legacy/siscontrollerverifier.cpp Tue May 25 12:50:16 2010 +0300
@@ -96,9 +96,11 @@
void CSisControllerVerifier::CompleteRequestL()
{
TPckg<TBool> packageResult(isVerified);
-
- iMessage.WriteL(EIpcArgument0, packageResult);
- iMessage.Complete(KErrNone);
+ if ( !iMessage.IsNull() )
+ {
+ iMessage.WriteL(EIpcArgument0, packageResult);
+ iMessage.Complete(KErrNone);
+ }
}
TInt CSisControllerVerifier::RunError(TInt)
--- a/installationservices/swi/source/sisregistry/server_legacy/sisregistryserver.cpp Tue May 11 16:20:28 2010 +0300
+++ b/installationservices/swi/source/sisregistry/server_legacy/sisregistryserver.cpp Tue May 25 12:50:16 2010 +0300
@@ -25,6 +25,8 @@
#include <s32mem.h>
#include <f32file.h>
#include <s32file.h>
+#include <startupdomainpskeys.h>
+#include <e32const.h>
#include "sisregistryserver.h"
#include "sisregistrycache.h"
@@ -104,6 +106,16 @@
//
{
DEBUG_PRINTF(_L8("SIS Registry Server - Starting Server"));
+ TInt value( EIdlePhase1Ok );
+ RProperty::Get( KPSUidStartup, KPSIdlePhase1Ok, value );
+ if ( value == EIdlePhase1NOK )
+ {
+ DEBUG_PRINTF(_L8("SIS Registry Server - Setting process priority to Low"));
+ // Using 150 instead of EPriorityLow as there is conflict between TPriority
+ // and TProcessPriority enum constants.
+ RProcess().SetPriority(TProcessPriority(150));
+ DEBUG_PRINTF(_L8("SIS Registry Server - Set process priority to Low"));
+ }
StartL(KSisRegistryName);
// create the cache
iCache = CSisRegistryCache::NewL();
--- a/secureswitools/openssllib/import/bin/deb/distribution.policy Tue May 11 16:20:28 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Category E
-OSD: Optional Replaceable Software Install Tools PC Side
-Export Restricted
-# This code has been obtained from www.OpenSSL.org and is
-# potentially subject to license and export restrictions.
-
--- a/secureswitools/openssllib/import/bin/linux-x86/deb/distribution.policy Tue May 11 16:20:28 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Category E
-OSD: Optional Replaceable Software Install Tools PC Side
-Export Restricted
-# This code has been obtained from www.OpenSSL.org and is
-# potentially subject to license and export restrictions.
-
--- a/secureswitools/openssllib/import/bin/linux-x86/rel/distribution.policy Tue May 11 16:20:28 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Category E
-OSD: Optional Replaceable Software Install Tools PC Side
-Export Restricted
-# This code has been obtained from www.OpenSSL.org and is
-# potentially subject to license and export restrictions.
-
--- a/secureswitools/openssllib/import/bin/rel/distribution.policy Tue May 11 16:20:28 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Category E
-OSD: Optional Replaceable Software Install Tools PC Side
-Export Restricted
-# This code has been obtained from www.OpenSSL.org and is
-# potentially subject to license and export restrictions.
-