# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1270061087 -10800 # Node ID 0817e13c927eda4a5c1989c381377562c1008a4a # Parent 7ca52d38f8c3c12bd27b30df4176bf4c4e81ddd5 Revision: 201011 Kit: 201013 diff -r 7ca52d38f8c3 -r 0817e13c927e appinstaller/AppMngr2/GSSettingsPlugin/data/appmngr2gssettingspluginrsc.rss --- a/appinstaller/AppMngr2/GSSettingsPlugin/data/appmngr2gssettingspluginrsc.rss Mon Mar 15 12:41:05 2010 +0200 +++ b/appinstaller/AppMngr2/GSSettingsPlugin/data/appmngr2gssettingspluginrsc.rss Wed Mar 31 21:44:47 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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 @@ { command = EAppMngr2CmdChange; txt = qtn_options_change; - flags = EEikMenuItemSpecific; + flags = EEikMenuItemAction; }, MENU_ITEM { diff -r 7ca52d38f8c3 -r 0817e13c927e appinstaller/AppinstUi/CenRep/keys_s60swinstalleruis.xls Binary file appinstaller/AppinstUi/CenRep/keys_s60swinstalleruis.xls has changed diff -r 7ca52d38f8c3 -r 0817e13c927e appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDetailsDialog.cpp --- a/appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDetailsDialog.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDetailsDialog.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -27,7 +27,7 @@ #include #include #include -#include +#include // DRM::CDrmUiHandling #include "CUIDetailsDialog.h" #include "CUICertificateDetailsDialog.h" @@ -531,9 +531,9 @@ // void CCUIDetailsDialog::DoShowDrmL() { - CDRMHelper* helper = CDRMHelper::NewLC( *iCoeEnv ); - helper->LaunchDetailsViewEmbeddedL( iFile ); - CleanupStack::PopAndDestroy( helper ); + DRM::CDrmUiHandling *drmUiHandler = DRM::CDrmUiHandling::NewLC(); + drmUiHandler->ShowDetailsViewL( iFile ); + CleanupStack::PopAndDestroy( drmUiHandler ); } // ----------------------------------------------------------------------------- diff -r 7ca52d38f8c3 -r 0817e13c927e appinstaller/AppinstUi/group/SWInstCommonUI.mmp --- a/appinstaller/AppinstUi/group/SWInstCommonUI.mmp Mon Mar 15 12:41:05 2010 +0200 +++ b/appinstaller/AppinstUi/group/SWInstCommonUI.mmp Wed Mar 31 21:44:47 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -74,7 +74,7 @@ LIBRARY crypto.lib LIBRARY hlplch.lib LIBRARY featmgr.lib -LIBRARY DRMHelper.lib +LIBRARY DRMUiHandling.lib LIBRARY sysutil.lib LIBRARY egul.lib LIBRARY hash.lib diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdate/IAD/engine/group/bld.inf --- a/iaupdate/IAD/engine/group/bld.inf Mon Mar 15 12:41:05 2010 +0200 +++ b/iaupdate/IAD/engine/group/bld.inf Wed Mar 31 21:44:47 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" @@ -26,7 +26,8 @@ PRJ_EXPORTS // Config file -iaupdateengineconfig.xml /epoc32/release/winscw/udeb/z/private/2000F85A/iaupdateengineconfig.xml -iaupdateengineconfig.xml /epoc32/release/winscw/urel/z/private/2000F85A/iaupdateengineconfig.xml -iaupdateengineconfig.xml /epoc32/data/z/private/2000F85A/iaupdateengineconfig.xml +iaupdateengineconfig.xml /epoc32/release/winscw/udeb/z/private/2000F85A/iaupdateengineconfig.xml +iaupdateengineconfig.xml /epoc32/release/winscw/urel/z/private/2000F85A/iaupdateengineconfig.xml +iaupdateengineconfig.xml /epoc32/data/z/private/2000F85A/iaupdateengineconfig.xml +iaupdateengineconfig_testing.xml /epoc32/data/z/private/2000F85A/iaupdateengineconfig_testing.xml diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdate/IAD/engine/group/iaupdateengineconfig_testing.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/iaupdate/IAD/engine/group/iaupdateengineconfig_testing.xml Wed Mar 31 21:44:47 2010 +0300 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp --- a/iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -129,7 +129,8 @@ iEikonEnv->CreateResourceReaderLC( reader, R_IAUPDATE_UPDATES_LIST ); iListBox->ConstructFromResourceL( reader ); CleanupStack::PopAndDestroy(); - + + iListBox->EnableStretching( EFalse ); iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue ); // Setup scroll bars diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdate/IAD/ui/src/iaupdatemainview.cpp --- a/iaupdate/IAD/ui/src/iaupdatemainview.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/iaupdate/IAD/ui/src/iaupdatemainview.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -486,13 +486,13 @@ //There are selected items already and type are different with the current one if ( selectedNodes.Count() > 0 && (iAllNodes[aIndex]->NodeType() != selectedNodes[0]->NodeType() ) ) { - HBufC* msgText = StringLoader::LoadLC(R_IAUPDATE_FIRMWARE_WITH_OTHERS); + /*HBufC* msgText = StringLoader::LoadLC(R_IAUPDATE_FIRMWARE_WITH_OTHERS); CAknQueryDialog* dlg = CAknQueryDialog::NewL(); dlg->ExecuteLD( R_IAUPDATE_INFORMATION_QUERY, *msgText ); - CleanupStack::PopAndDestroy( msgText ); + CleanupStack::PopAndDestroy( msgText );*/ //clean all of the current selection(s) iContainer->CleanAllSelection(); diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdate/IAD/ui/src/iaupdatenodefilter.cpp --- a/iaupdate/IAD/ui/src/iaupdatenodefilter.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/iaupdate/IAD/ui/src/iaupdatenodefilter.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -204,6 +204,31 @@ } else { + if ( aFwNodes.Count() == 1 && aFwNodes[0]->FwType() == MIAUpdateFwNode::EFotiNsu ) + { + aFwNodes[0]->Base().SetSelected( EFalse ); + } + else + { + for ( TInt i = 0; i < aFwNodes.Count(); ++i ) + { + aFwNodes[i]->Base().SetSelected( ETrue ); + } + for ( TInt i = 0; i < aNodes.Count(); ++i ) + { + aNodes[i]->Base().SetSelected( EFalse ); + } + } + } + } + else + { + if ( aFwNodes.Count() == 1 && aFwNodes[0]->FwType() == MIAUpdateFwNode::EFotiNsu ) + { + aFwNodes[0]->Base().SetSelected( EFalse ); + } + else + { for ( TInt i = 0; i < aFwNodes.Count(); ++i ) { aFwNodes[i]->Base().SetSelected( ETrue ); @@ -214,17 +239,6 @@ } } } - else - { - for ( TInt i = 0; i < aFwNodes.Count(); ++i ) - { - aFwNodes[i]->Base().SetSelected( ETrue ); - } - for ( TInt i = 0; i < aNodes.Count(); ++i ) - { - aNodes[i]->Base().SetSelected( EFalse ); - } - } } else { diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdateapi_stub/group/bld.inf --- a/iaupdateapi_stub/group/bld.inf Mon Mar 15 12:41:05 2010 +0200 +++ b/iaupdateapi_stub/group/bld.inf Wed Mar 31 21:44:47 2010 +0300 @@ -31,6 +31,6 @@ ../sis/iaupdate_stub.SIS /epoc32/data/z/system/install/stub_iaupdate_stub.sis PRJ_MMPFILES -iaupdateapi.mmp +iaupdateapi_stub.mmp diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdateapi_stub/group/iaupdateapi.mmp --- a/iaupdateapi_stub/group/iaupdateapi.mmp Mon Mar 15 12:41:05 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* -* 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" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Project definition file -* -*/ - - -#include - - -CAPABILITY CAP_GENERAL_DLL - -TARGET iaupdateapi_stub.dll - -LINKAS iaupdateapi.dll -EXPORTLIBRARY iaupdateapi_stub.lib - -TARGETTYPE dll -UID 0x1000008d 0x2000F85C - - -// API stub source files -SOURCEPATH ../src -SOURCE iaupdate.cpp -SOURCE iaupdateparameters.cpp -SOURCE iaupdateresult.cpp - - -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib diff -r 7ca52d38f8c3 -r 0817e13c927e iaupdateapi_stub/group/iaupdateapi_stub.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/iaupdateapi_stub/group/iaupdateapi_stub.mmp Wed Mar 31 21:44:47 2010 +0300 @@ -0,0 +1,42 @@ +/* +* 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Project definition file +* +*/ + + +#include + + +CAPABILITY CAP_GENERAL_DLL + +TARGET iaupdateapi_stub.dll + +LINKAS iaupdateapi.dll +EXPORTLIBRARY iaupdateapi_stub.lib + +TARGETTYPE dll +UID 0x1000008d 0x2000F85C + + +// API stub source files +SOURCEPATH ../src +SOURCE iaupdate.cpp +SOURCE iaupdateparameters.cpp +SOURCE iaupdateresult.cpp + + +MW_LAYER_SYSTEMINCLUDE + +LIBRARY euser.lib diff -r 7ca52d38f8c3 -r 0817e13c927e installationservices/swi/source/swis/server/installmachine.cpp --- a/installationservices/swi/source/swis/server/installmachine.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/installationservices/swi/source/swis/server/installmachine.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -362,10 +362,6 @@ iInstallMachine.CompleteSelf(); iInstallMachine.SetActive(); - // user hasn't cancelled so mark the installation as confirmed. This - // will allow the registry cache to be regenerated further on during the - // installation process. - iInstallMachine.iOperationConfirmed = ETrue; } CInstallMachine::TState* CInstallMachine::TConfirmationState::CompleteL() @@ -1038,6 +1034,10 @@ DEBUG_PRINTF(_L8("Install Machine - Completed Postrequisites Check State")); // Inform UI of final progress bar value. iInstallMachine.SetProgressBarFinalValueL(); + // user hasn't cancelled so mark the installation as confirmed. This + // will allow the registry cache to be regenerated further on during the + // installation process. + iInstallMachine.iOperationConfirmed = ETrue; return static_cast(&iInstallMachine.iIntegritySupportState); } diff -r 7ca52d38f8c3 -r 0817e13c927e installationservices/swi/source/swis/server/uninstallmachine.cpp --- a/installationservices/swi/source/swis/server/uninstallmachine.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/installationservices/swi/source/swis/server/uninstallmachine.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -172,10 +172,6 @@ iUninstallMachine.CompleteSelf(); iUninstallMachine.SetActive(); - // The user hasn't cancelled so mark the un-installation as confirmed. This - // will allow the registry cache to be regenerated further on during the - // un-installation process. - iUninstallMachine.iOperationConfirmed = ETrue; } // The next state will be planning uninstallation. @@ -234,6 +230,10 @@ CUninstallMachine::TState* CUninstallMachine::TPlanUninstallationState::CompleteL() { DEBUG_PRINTF(_L8("Uninstall Machine - Completed Uninstallation Planning State")); + // The user hasn't cancelled so mark the un-installation as confirmed. This + // will allow the registry cache to be regenerated further on during the + // un-installation process. + iUninstallMachine.iOperationConfirmed = ETrue; return static_cast(&iUninstallMachine.iIntegritySupportState); } diff -r 7ca52d38f8c3 -r 0817e13c927e ncdengine/engine/inc/catalogsconstants.h --- a/ncdengine/engine/inc/catalogsconstants.h Mon Mar 15 12:41:05 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ -/* -* Copyright (c) 2006 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" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Constants and definitions. -* -*/ - - -#ifndef CATALOGS_CONSTANTS_H -#define CATALOGS_CONSTANTS_H - -#include -#include - -#include "catalogsuids.h" - -// Replaced with USE_BUILD_SCRIPT when using build script -#define DUMMY_DEFINE - - -/** - * Catalogs engine mutex name. All engine object instances have a handle to the mutex. - * This can be used to determine if there are engine objects in use. - */ -#ifdef USE_BUILD_SCRIPT -_LIT( KCatalogsEngineMutex, "ncd-engine-mutex_APP_NAME_POSTFIX" ); -#else -_LIT( KCatalogsEngineMutex, "ncd-engine-mutex_20019119" ); -#endif // USE_BUILD_SCRIPT - -/** - * Note on RProperty usage. - * RProperty is defined by category and key. - * - * The engine server side process defines RProperty that is defined - * to have category value equal to SID of the process. - * Two kinds of info are published using RProperty. - * - general settings (currently only maintenance lock status) - * - client specific connection activity indicator - * - * Connection activity uses RProperty with key that is same as client SID. - * Because both information are published within the same category, we must ensure - * that there are no conflicts in key values. To ensure this, following assumptions - * about keys are used: - * - all settings values (such as maintenance lock) must be from protected UID - * range class 0 (0x00000000 - 0x0FFFFFFF) - * - all engine clients must use UIDs from class 2 (0x20000000 - 0x2FFFFFFF) - */ - -/** Catalogs engine property category */ -const TUid KCatalogsEnginePropertyCategory = { KCatalogsServerUid }; - -/** - * Catalogs engine maintenance lock property key. Written when locking/releasing - * (0 = released). - */ -const TUint KCatalogsEnginePropertyKeyMaintenanceLock = 1; - -/** - * Catalogs update message queue name format string. Global message queue with this - * name is created - */ -_LIT( KCatalogsUpdateQueueNameFormat, "CatalogsUpdate-%08x" ); - -/** Catalogs OTA update message queue message size */ -const TInt KCatalogsUpdateQueueMessageSize = RMsgQueueBase::KMaxLength; -const TInt KCatalogsUpdateQueueSlotCount = 32; - -/** Catalogs engine ECom implementation uid */ -const TUid KCCatalogsEngineImplUid = { KCatalogsEngineImplementationUid }; - -/** Catalogs OTA update information maximum field sizes */ -const TInt KCatalogsUpdateInformationMaxSize = 3*1024; -const TInt KCatalogsUpdateTargetMaxSize = 256; -const TInt KCatalogsUpdateIdMaxSize = 1024; -const TInt KCatalogsUpdateVersionMaxSize = 256; -const TInt KCatalogsUpdateUriMaxSize = 1024; - - -/** - * Mime type match strings. - */ - -_LIT( KMimeTypeMatchSymbianInstall, "application/vnd.symbian.install" ); -_LIT( KMimeTypeMatch1JavaApplication, "*java?archive" ); -_LIT( KMimeTypeMatch2JavaApplication, "application/java-archive" ); -_LIT( KMimeTypeMatchRealMedia, "application/vnd.rn-realmedia" ); -_LIT( KMimeTypeMatchApplicationStream,"application/octet-stream" ); -_LIT( KMimeTypeMatchApplication, "application/*" ); - -_LIT( KMimeTypeMatchSis, "x-epoc/x-app268436505" ); -_LIT( KMimeTypeMatchSisx, "x-epoc/x-sisx-app" ); - - -_LIT( KMimeTypeMatchHtml, "text/html" ); -_LIT( KMimeTypeMatchTxt, "text/plain" ); -_LIT( KMimeTypeMatchCod, "text/x-co-desc" ); -_LIT8( KMimeTypeXml, "text/xml" ); - -_LIT( KMimeTypeMatchDrmMessage, "application/vnd.oma.drm.message" ); -_LIT( KMimeTypeMatchDrmRightsXml, "application/vnd.oma.drm.rights+xml" ); -_LIT( KMimeTypeMatchDrmRightsWbxml, "application/vnd.oma.drm.rights+wbxml" ); -_LIT8( KMimeTypeMatchDrmRightsXml8, "application/vnd.oma.drm.rights+xml" ); -_LIT8( KMimeTypeMatchDrmRightsWbxml8, "application/vnd.oma.drm.rights+wbxml" ); -_LIT( KMimeTypeMatchDrmContent, "application/vnd.oma.drm.content" ); -_LIT8( KMimeTypeMatchDrm8, "application/vnd.oma.drm.*" ); - -_LIT( KMimeTypeMatchOdd, "application/vnd.oma.dd*" ); -_LIT8( KMimeTypeMatchOdd8, "application/vnd.oma.dd*" ); - -_LIT( KMimeTypeMatchWidget, "application/x-nokia-widget" ); - -_LIT( KHttpMatchString, "http://*" ); - -// Descriptor types -_LIT( KDescriptorTypeOdd, "dd" ); -_LIT( KDescriptorTypeJad, "jad" ); - -_LIT( KMimeTypeMatchJad, "text/vnd.sun.j2me.app-descriptor" ); -_LIT8( KMimeTypeMatchJad8, "text/vnd.sun.j2me.app-descriptor" ); - -_LIT( KDirectorySeparator, "\\" ); - -// List granularity used in initializing various lists and arrays. -const TInt KListGranularity( 8 ); - -// CBufFlat expansion size, should not be very small for good -// performance. -const TInt KBufExpandSize( 256 ); - -// Granularity for CCatalogsStringManager's string arrays -const TInt KStringArrayGranularity( 256 ); - - -// Query id for payment method query. -_LIT( KQueryIdPaymentMethod, "deadbeef" ); - - -// Engine configuration file -_LIT( KCatalogsConfigFile, "config.xml" ); - -// Download manager root dir -_LIT( KCatalogsDownloadMgrPath, "C:\\system\\dmgr\\%S\\downloads\\*.*" ); - -// Number of attempts before we give up on connecting to download manager -const TInt KCatalogsDlMgrConnectRetryAttempts = 5; - -// tenth of a second, the time between download manager connect attemps -const TInt KCatalogsDlMgrConnectRetryInterval = 100000; - -#endif // CATALOGS_CONSTANTS_H diff -r 7ca52d38f8c3 -r 0817e13c927e ncdengine/engine/src/stackpointer.s --- a/ncdengine/engine/src/stackpointer.s Mon Mar 15 12:41:05 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -; -; Copyright (c) 2009 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" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; - - -;.text -;.global GetStackPointer -; -;GetStackPointer: -; mov r0,r13 -; mov pc,r14 - - AREA |.text|, CODE, READONLY - EXPORT GetStackPointer - -GetStackPointer - mov r0,sp - bx lr - END diff -r 7ca52d38f8c3 -r 0817e13c927e ncdengine/group/altair-engine-stub.SIS Binary file ncdengine/group/altair-engine-stub.SIS has changed diff -r 7ca52d38f8c3 -r 0817e13c927e ncdengine/provider/deviceinteraction/src/ncddeviceserviceimpl.cpp --- a/ncdengine/provider/deviceinteraction/src/ncddeviceserviceimpl.cpp Mon Mar 15 12:41:05 2010 +0200 +++ b/ncdengine/provider/deviceinteraction/src/ncddeviceserviceimpl.cpp Wed Mar 31 21:44:47 2010 +0300 @@ -166,6 +166,7 @@ void CNcdDeviceService::RunL() { DLTRACEIN(( "iStatus: %d", iStatus.Int() )); + DLINFO(( "iState: %d", iState )); // GetSubscriberId fails with KErrNotFound if there's no SIM in the device switch ( iState ) @@ -182,7 +183,8 @@ case EGetSubscriberId: { if ( iStatus.Int() == KErrNone || - iStatus.Int() == KErrNotFound ) + iStatus.Int() == KErrNotFound || + iStatus.Int() == KErrNotReady ) { DLTRACE(("Got subscriber ID")); diff -r 7ca52d38f8c3 -r 0817e13c927e secureswitools/makekeys/group/bld.inf --- a/secureswitools/makekeys/group/bld.inf Mon Mar 15 12:41:05 2010 +0200 +++ b/secureswitools/makekeys/group/bld.inf Wed Mar 31 21:44:47 2010 +0300 @@ -27,8 +27,6 @@ PRJ_EXPORTS -../group/makekeys.ipr /epoc32/engdoc/tools/makekeys.ipr - PRJ_MMPFILES #ifdef TOOLS #ifndef TOOLS2 diff -r 7ca52d38f8c3 -r 0817e13c927e secureswitools/makekeys/group/makekeys.ipr --- a/secureswitools/makekeys/group/makekeys.ipr Mon Mar 15 12:41:05 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -[purpose] - -Creates private/public key pair and generates certificate requests. -Used with makesis to create digitally signed SIS files. - -[categories] -development - -[files] -tools\makekeys.exe - -[owner] -Runtime & Tools # MAKEKEYS - -[IPR] -Copyright (c) 2000 Symbian Ltd. All rights reserved. - -Makekeys.exe can be freely distributed as a binary, -but the source code requires an export licence. diff -r 7ca52d38f8c3 -r 0817e13c927e secureswitools/makekeys/group/security_makekeys.mrp --- a/secureswitools/makekeys/group/security_makekeys.mrp Mon Mar 15 12:41:05 2010 +0200 +++ b/secureswitools/makekeys/group/security_makekeys.mrp Wed Mar 31 21:44:47 2010 +0300 @@ -4,10 +4,8 @@ #MattD: it doesn't like 'tools rel'... binary \epoc32\tools\makekeys.exe exports \sf\mw\appinstall\secureswitools\makekeys\group --export_file \sf\mw\appinstall\secureswitools\makekeys\group\makekeys.ipr \epoc32\engdoc\tools\makekeys.ipr notes_source \component_defs\release.src - ipr E ipr T \sf\mw\appinstall\secureswitools\makekeys\tdata