--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Tue May 11 16:22:38 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Tue May 25 12:52:36 2010 +0300
@@ -10,13 +10,17 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
-* NTT DOCOMO, INC - BUG 2365
+*
*
* Description:
*
*/
+/*
+*NTT DOCOMO, INC - BUG 2365
+*/
+
#include <platform_paths.hrh>
PRJ_PLATFORMS
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Tue May 11 16:22:38 2010 +0300
+++ b/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Tue May 25 12:52:36 2010 +0300
@@ -10,13 +10,17 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
-* NTT DOCOMO, INC - BUG 2365
+*
*
* Description: Build information file for project PSStateSourcePlugIn
*
*/
+/*
+*NTT DOCOMO, INC - BUG 2365
+*/
+
#include <platform_paths.hrh>
PRJ_PLATFORMS
--- a/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Tue May 11 16:22:38 2010 +0300
+++ b/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Tue May 25 12:52:36 2010 +0300
@@ -10,12 +10,15 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
-* NTT DOCOMO, INC - BUG 2365
+*
*
* Description: Build information file for project SensorSourcePlugin
*
*/
+/*
+*NTT DOCOMO, INC - BUG 2365
+*/
#include <platform_paths.hrh>
--- a/coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.pkg Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.pkg Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+;
+; 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: ?Description
+;
+
; ExtAtCmdHandler.pkg
;
;Language - standard language definitions
--- a/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Tue May 25 12:52:36 2010 +0300
@@ -28,7 +28,7 @@
#include <MediatorCommandResponder.h>
#include <MediatorEventProvider.h>
#include <w32std.h> // Remove this when SecondaryDisplayStartupAPI.h includes it properly.
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include "SysApAppUi.h"
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Tue May 25 12:52:36 2010 +0300
@@ -131,7 +131,7 @@
#include "SysApMediatorObserver.h"
-#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
+#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
#include "aknSDData.h"
#include <AknTaskList.h>
@@ -268,6 +268,9 @@
to other applications. For example it does not get closed when system is asked to close applications
*/
iEikonEnv->SetSystem( ETrue );
+ // For cdma
+
+ iTDEnable = FeatureManager::FeatureSupported( KFeatureIdFfTdScdma );
iEikonEnv->WsSession().ComputeMode( RWsSession::EPriorityControlDisabled );
@@ -3642,8 +3645,17 @@
// Append memory cards for eject selection
TInt count( iInsertedMemoryCards.Count() );
+ TInt corruptedMedia = 0;
for ( TInt i( 0 ); i < count; ++i )
{
+ TVolumeInfo info;
+ TInt err = iEikonEnv->FsSession().Volume(info, iInsertedMemoryCards[ i ].iDrive);
+ TRACES( RDebug::Print(_L("CSysApAppUi::AddMmcMenuItemsL: corrupted media, iDrive (%d) Error: %d" ),iInsertedMemoryCards[ i ].iDrive, err ) );
+ if(err != KErrNone)
+ {
+ corruptedMedia++;
+ continue;
+ }
itemStringBuf = iSysApDriveList->GetFormattedDriveNameLC(
iInsertedMemoryCards[ i ].iDrive,
R_QTN_PWRC_EJECT_MEMORY_STORAGE );
@@ -3656,12 +3668,12 @@
SecondaryDisplay::EPwrMenuItemEjectItemBase + i );
}
}
- if ( count > 0 )
+ if ( (count-corruptedMedia) > 0 )
{
TRACES( RDebug::Print(_L("CSysApAppUi::AddMmcMenuItemsL: added \"Eject\"" ) ) );
iPowerkeyMenuEjectShown = ETrue;
iPowerkeyMenuEjectSelectionBase = aPowerMenuItemIndex;
- aPowerMenuItemIndex += count;
+ aPowerMenuItemIndex += (count-corruptedMedia);
}
}
}
--- a/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Tue May 25 12:52:36 2010 +0300
@@ -27,7 +27,7 @@
#include <avkon.hrh>
#include <avkon.rsg>
#include <SysAp.rsg>
-#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
+#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
#include <aknSDData.h>
// Constants
--- a/coreapplicationuis/SysAp/Src/SysApMsgSimMemLowQuery.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApMsgSimMemLowQuery.cpp Tue May 25 12:52:36 2010 +0300
@@ -20,7 +20,7 @@
#include <AknGlobalConfirmationQuery.h>
#include "SysApMsgSimMemLowQuery.h"
#include "SysAp.hrh"
-#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
+#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
#include <aknSDData.h>
// ============================ MEMBER FUNCTIONS ==============================
--- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Tue May 25 12:52:36 2010 +0300
@@ -22,7 +22,7 @@
#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
#include <aknappui.h>
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include <startupdomaincrkeys.h>
#include "SysApShutdownAnimation.h"
--- a/coreapplicationuis/SysAp/Src/SysApWaitNote.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApWaitNote.cpp Tue May 25 12:52:36 2010 +0300
@@ -22,7 +22,7 @@
#include <avkon.rsg>
#include "SysAp.hrh"
#include "SysApWaitNote.h"
-#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
+#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
#include <aknSDData.h>
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiDialogNotifier.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiDialogNotifier.cpp Tue May 25 12:52:36 2010 +0300
@@ -21,7 +21,7 @@
#include "acc_debug.h"
#include <featmgr.h>
-#include <SecondaryDisplay/SecondaryDisplayAccFwAPI.h>
+#include <secondarydisplay/SecondaryDisplayAccFwAPI.h>
#include <accfwnoteuinotifier.rsg>
#include <aknlistquerydialog.h>
#include <aknlists.h>
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Tue May 25 12:52:36 2010 +0300
@@ -21,7 +21,7 @@
#include <accfwnoteuinotifier.rsg>
#include <data_caging_path_literals.hrh>
#include <aknnotewrappers.h>
-#include <SecondaryDisplay/SecondaryDisplayAccFwAPI.h>
+#include <secondarydisplay/SecondaryDisplayAccFwAPI.h>
#include <bautils.h>
#include "AccFwUiNoteNotifier.h"
--- a/coreapplicationuis/advancedtspcontroller/group/bld.inf Tue May 11 16:22:38 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/group/bld.inf Tue May 25 12:52:36 2010 +0300
@@ -10,7 +10,7 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
-* NTT DOCOMO, INC - BUG 2365
+*
*
* Description: Bld.inf file for Symbian's Remote Control framework related
* plug-ins that are used to deliver messages (e.g. accessory key
@@ -18,6 +18,9 @@
*
*/
+/*
+*NTT DOCOMO, INC - BUG 2365
+*/
#include <platform_paths.hrh>
--- a/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Tue May 25 12:52:36 2010 +0300
@@ -23,7 +23,7 @@
#include <MediatorCommandResponder.h>
#include <MediatorPluginBase.h>
#include <MediatorEventProvider.h>
-#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
+#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
// FORWARD DECLARATIONS
--- a/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Tue May 25 12:52:36 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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,7 +22,7 @@
// SYSTEM INCLUDES
#include <MediatorDomainUIDs.h>
#include <startupdomainpskeys.h>
-#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
+#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
#include <avkondomainpskeys.h>
#include <coreapplicationuisdomainpskeys.h>
--- a/startupservices/Startup/inc/StartupAppUi.h Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/Startup/inc/StartupAppUi.h Tue May 25 12:52:36 2010 +0300
@@ -38,7 +38,7 @@
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
// USER INCLUDES
--- a/startupservices/Startup/pubsub/startupappprivatepskeys.h Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/Startup/pubsub/startupappprivatepskeys.h Tue May 25 12:52:36 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"
@@ -38,4 +38,6 @@
// and finished showing country & time queries.
};
+const TUint32 KPSStartupAppStarted = 0x00000002;
+
#endif // STARTUPAPPPRIVATEPSKEYS_H
--- a/startupservices/Startup/src/StartupApplication.cpp Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/Startup/src/StartupApplication.cpp Tue May 25 12:52:36 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -21,6 +21,12 @@
// INCLUDE FILES
#include "StartupApplication.h"
#include "StartupDocument.h"
+#include "startupappprivatepskeys.h"
+#include <e32property.h>
+
+//Security policies
+_LIT_SECURITY_POLICY_C1(KReadDeviceDataPolicy, ECapabilityReadDeviceData);
+_LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
// ========================= MEMBER FUNCTIONS ================================
@@ -53,6 +59,12 @@
GLDEF_C TInt E32Main()
{
+ //Make sure startup app is only started once
+ TInt ret = RProperty::Define(KPSUidStartupApp, KPSStartupAppStarted, RProperty::EInt, KReadDeviceDataPolicy, KWriteDeviceDataPolicy);
+ if(ret!=KErrNone)
+ {
+ return KErrNone;
+ }
return EikStart::RunApplication(NewApplication);
}
--- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Tue May 25 12:52:36 2010 +0300
@@ -23,7 +23,7 @@
#include <aknSDData.h>
#include <data_caging_path_literals.hrh>
#include <featmgr.h>
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include <StringLoader.h>
#include <startup.rsg>
#include <stringresourcereader.h>
--- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Tue May 11 16:22:38 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Tue May 25 12:52:36 2010 +0300
@@ -24,7 +24,7 @@
#include <Profile.hrh>
#include <ProfileEngineSDKCRKeys.h>
#include "sanimengine.h"
-#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
+#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
#include "sanimstartupctrl.h"
#include "trace.h"
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Tue May 25 12:52:36 2010 +0300
@@ -19,7 +19,7 @@
// SYSTEM INCLUDES
#include <e32property.h>
#include <AknGlobalNote.h>
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
+#include <secondarydisplay/AknSecondaryDisplayDefs.h>
#include <aknSDData.h>
#include <avkon.rsg>
#include <data_caging_path_literals.hrh>
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+;
+; 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: ?Description
+;
+
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+;
+; 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: ?Description
+;
+
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls Tue May 25 12:52:36 2010 +0300
@@ -44,6 +44,6 @@
#define qtn_about_dialog_title "About"
-#define qtn_about_dialog_text "t_oomdummyapp Version 1.0.0\n\nAuthor: \n\nSupport: support@mycompany.com\n\n(c) Your copyright notice"
+#define qtn_about_dialog_text "t_oomdummyapp Version 1.0.0\n\nAuthor: \n\nSupport:\n"
// End of File
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2005 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:
+#
+
# ============================================================================
# Name : Icons_scalable_dc.mk
# Part of : t_oomdummyapp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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:
+#
+
# ============================================================================
# Name : build_help.mk
# Part of : t_oomdummyapp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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:
+*
+*/
+
#ifndef T_OOMDUMMAPPMSGS_H_
#define T_OOMDUMMAPPMSGS_H_
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+;
+; 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: ?Description
+;
+
; Installation file for t_oomdummyapp application
;
; This is an auto-generated PKG file by Carbide.
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss Tue May 25 12:52:36 2010 +0300
@@ -19,7 +19,7 @@
-#include <ecom\registryinfo.rh>
+#include <ecom/registryinfo.rh>
#include <oommonitorplugin.hrh>
RESOURCE REGISTRY_INFO theInfo
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp Tue May 25 12:52:36 2010 +0300
@@ -18,7 +18,7 @@
-#include <ecom\implementationproxy.h>
+#include <ecom/implementationproxy.h>
#include "dummyplugin.h"
#define DECLARE_CREATE_INSTANCE(UID) CDummyOomPlugin* CreateInstance##UID() { return CDummyOomPlugin::NewL(UID); }
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss Tue May 25 12:52:36 2010 +0300
@@ -20,7 +20,7 @@
-#include <ecom\registryinfo.rh>
+#include <ecom/registryinfo.rh>
#include <oommonitorplugin.hrh>
RESOURCE REGISTRY_INFO theInfo
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp Tue May 25 12:52:36 2010 +0300
@@ -18,7 +18,7 @@
-#include <ecom\implementationproxy.h>
+#include <ecom/implementationproxy.h>
#include "dummyplugin2.h"
#define DECLARE_CREATE_INSTANCEV2(UID) CDummyOomPluginV2* CreateInstance##UID() { return CDummyOomPluginV2::NewL(UID); }
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+;
+; 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: ?Description
+;
+
; Installation file for Symbian OS 9.x for generic console application
; Installation file for t_oomharness EXE
;
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,19 @@
+;
+; 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: ?Description
+;
+
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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:
+*
+*/
+
/*
============================================================================
Name : t_oomtestappApplication.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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:
+*
+*/
+
/*
============================================================================
Name : t_oomtestappAppUi.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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:
+*
+*/
+
/*
============================================================================
Name : t_oomtestappAppView.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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:
+*
+*/
+
/*
============================================================================
Name : t_oomtestappcmd.hrh
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h Tue May 11 16:22:38 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h Tue May 25 12:52:36 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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:
+*
+*/
+
/*
============================================================================
Name : t_oomtestappDocument.h
Binary file systemsettings/GSAccessoryPlugin/conf/GSAccessoriesPlugin_101F8779.crml has changed
--- a/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp Tue May 11 16:22:38 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp Tue May 25 12:52:36 2010 +0300
@@ -99,7 +99,28 @@
User::LeaveIfError(iDbsSession.Connect());
//Attempt to open the database
TInt error = iLocalizedTimeZoneDb.Open(iDbsSession,KTzLocalizationDbName,KTzLocalizationDbSecurityPolicy);
+ if (error == KErrNotFound)
+ {
+ //Database file doesn't exist. Attempt to create a new one.
+ error = iLocalizedTimeZoneDb.Create(iDbsSession,KTzLocalizationDbName,KTzLocalizationDbSecurityPolicy);
+ if (error == KErrNone)
+ {
+ User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
+ User::LeaveIfError(CreateUserCityTableL());
+ }
+ }
User::LeaveIfError(error);
+ // Check if both tables are created.
+ TRAP(error, iLocalizedTimeZoneDb.ColSetL(KCZTableName));
+ if (error)
+ {
+ User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
+ }
+ TRAP(error, iLocalizedTimeZoneDb.ColSetL(KUCTableName));
+ if (error)
+ {
+ User::LeaveIfError(CreateUserCityTableL());
+ }
}
/**
--- a/tzservices/tzserver/group/BLD.INF Tue May 11 16:22:38 2010 +0300
+++ b/tzservices/tzserver/group/BLD.INF Tue May 25 12:52:36 2010 +0300
@@ -57,6 +57,7 @@
// ROM
TimeZoneServer.iby /epoc32/rom/include/timezoneserver.iby
+Timezoneserver.iby /epoc32/rom/include/core/mw/timezoneserver.iby
PRJ_MMPFILES
TimeZoneClient.mmp