--- a/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Wed Apr 14 16:08:26 2010 +0300
+++ b/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Tue Apr 27 16:49:15 2010 +0300
@@ -25,8 +25,7 @@
SOURCE zerosizedicontestapp.cpp
USERINCLUDE .
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/techview
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
// Application exe specific resource which is localised to the application
RESOURCE zerosizedicon_loc.rss
--- a/contextframework/cfw/inc/cfactivatorengine/CFActivatorEngineActionPluginManager.h Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfw/inc/cfactivatorengine/CFActivatorEngineActionPluginManager.h Tue Apr 27 16:49:15 2010 +0300
@@ -158,6 +158,8 @@
* Not own. Can be NULL
*/
MCFStarterEventHandler* iEventHandler;
+// JNIA-849K7Gs
+ TBool iUpdatePluginsAllowed;
};
#endif
--- a/contextframework/cfw/inc/cfcontextsourcemanager/CFContextSourceManager.h Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfw/inc/cfcontextsourcemanager/CFContextSourceManager.h Tue Apr 27 16:49:15 2010 +0300
@@ -288,6 +288,8 @@
// Event handler, not own, can be NULL
MCFStarterEventHandler* iEventHandler;
+ //JNIA-849K7G Error
+ TBool iUpdatePluginsAllowed;
};
#endif
--- a/contextframework/cfw/src/cfactivatorengine/CFActivatorEngineActionPluginManager.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfw/src/cfactivatorengine/CFActivatorEngineActionPluginManager.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -268,7 +268,7 @@
void CCFActivatorEngineActionPluginManager::InitLoadingPluginsPhaseL()
{
FUNC_LOG;
-
+ iUpdatePluginsAllowed = ETrue;
UpdatePlugInsL();
}
@@ -280,7 +280,7 @@
void CCFActivatorEngineActionPluginManager::UpdatePlugInsL()
{
FUNC_LOG;
-
+ if (!iUpdatePluginsAllowed){return;}
// List all plugins
RImplInfoPtrArray implInfoArray;
CleanupPushImplInfoArrayL( implInfoArray );
--- a/contextframework/cfw/src/cfcontextsourcemanager/CFContextSourceManager.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfw/src/cfcontextsourcemanager/CFContextSourceManager.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -477,7 +477,7 @@
void CCFContextSourceManager::UpdatePlugInsL()
{
FUNC_LOG;
-
+ if (!iUpdatePluginsAllowed){return;}
// List all plugins
RImplInfoPtrArray implInfoArray;
CleanupResetAndDestroyPushL( implInfoArray );
@@ -784,7 +784,7 @@
void CCFContextSourceManager::InitLoadingPluginsPhaseL()
{
FUNC_LOG;
-
+ iUpdatePluginsAllowed = ETrue;
UpdatePlugInsL();
}
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Tue Apr 27 16:49:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -10,6 +10,7 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
+* NTT DOCOMO, INC - BUG 2365
*
* Description:
*
@@ -28,25 +29,19 @@
../rom/applicationstatesourcepluginhw.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ApplicationStateSourcePlugInHW.iby)
// Rule files
-../data/autorotateui_activate.xml\
- /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_activate.rul
-../data/autorotateui_activate.xml\
- /epoc32/data/z/private/10282bc4/rules/autorotateui_activate.rul
+/*
+Copy autorotateui_activate.xml, autorotateui_alwaysinportrait.xml, autorotateui_init.xml, autorotateui_rotate.xml to
+1. \epoc32\data\z\private\10282BC4\rules\
+2. \epoc32\release\winscw\udeb\z\private\10282BC4\rules\
+3. \epoc32\release\winscw\urel\z\private\10282BC4\rules\
+*/
+../data/autorotateui_activate.xml Z:/private/10282bc4/rules/autorotateui_activate.rul
-../data/autorotateui_alwaysinportrait.xml\
- /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_alwaysinportrait.rul
-../data/autorotateui_alwaysinportrait.xml\
- /epoc32/data/z/private/10282bc4/rules/autorotateui_alwaysinportrait.rul
+../data/autorotateui_alwaysinportrait.xml Z:/private/10282bc4/rules/autorotateui_alwaysinportrait.rul
-../data/autorotateui_init.xml\
- /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_init.rul
-../data/autorotateui_init.xml\
- /epoc32/data/z/private/10282bc4/rules/autorotateui_init.rul
+../data/autorotateui_init.xml Z:/private/10282bc4/rules/autorotateui_init.rul
-../data/autorotateui_rotate.xml\
- /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_rotate.rul
-../data/autorotateui_rotate.xml\
- /epoc32/data/z/private/10282bc4/rules/autorotateui_rotate.rul
+../data/autorotateui_rotate.xml Z:/private/10282bc4/rules/autorotateui_rotate.rul
#endif // RD_CONTEXT_FRAMEWORK
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Tue Apr 27 16:49:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-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"
@@ -10,7 +10,8 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
-*
+* NTT DOCOMO, INC - BUG 2365
+*
* Description: Build information file for project PSStateSourcePlugIn
*
*/
@@ -22,12 +23,14 @@
DEFAULT
PRJ_EXPORTS
-
-../data/10282C74.xml\
- /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/10282C74.xml
-../data/10282C74.xml\
- /epoc32/data/Z/private/10282BC4/Settings/10282C74/10282C74.xml
+/*
+Copy 10282C74.xml to
+1. \epoc32\data\z\private\10282BC4\Settings\10282C74\10282C74.xml
+2. \epoc32\release\winscw\udeb\z\private\10282BC4\Settings\10282C74\10282C74.xml
+3. \epoc32\release\winscw\urel\z\private\10282BC4\Settings\10282C74\10282C74.xml
+*/
+../data/10282C74.xml Z:/private/10282BC4/Settings/10282C74/10282C74.xml
../rom/psstatesourceplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(psstatesourceplugin.iby)
--- a/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Wed Apr 14 16:08:26 2010 +0300
+++ b/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Tue Apr 27 16:49:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-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"
@@ -10,6 +10,7 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
+* NTT DOCOMO, INC - BUG 2365
*
* Description: Build information file for project SensorSourcePlugin
*
@@ -26,11 +27,14 @@
#ifdef RD_CONTEXT_FRAMEWORK
../rom/sensorsourceplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(SensorSourcePlugin.iby)
-../data/10282DF0.xml\
- /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282DF0/10282DF0.xml
+/*
+Copy 10282DF0.xml to
+1. \epoc32\data\z\private\10282BC4\Settings\10282DF0\10282DF0.xml
+2. \epoc32\release\winscw\udeb\z\private\10282BC4\Settings\10282DF0\10282DF0.xml
+3. \epoc32\release\winscw\urel\z\private\10282BC4\Settings\10282DF0\10282DF0.xml
+*/
+../data/10282DF0.xml Z:/private/10282BC4/Settings/10282DF0/10282DF0.xml
-../data/10282DF0.xml\
- /epoc32/data/Z/private/10282BC4/Settings/10282DF0/10282DF0.xml
#endif // RD_CONTEXT_FRAMEWORK
PRJ_MMPFILES
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -1685,7 +1685,8 @@
else if ( aValue == EChargingStatusNotConnected )
{
TRACES( RDebug::Print( _L("SysAp: charger removed") ) );
- iSysApLightsController->ChargerConnectedL( EFalse );
+ iSysApLightsController->ChargerConnectedL( EFalse );
+ iSysApUsbChargerDetector.Reset();
if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
@@ -1695,7 +1696,6 @@
ShowUiNoteL( EUnplugChargerNote );
}
}
- iSysApUsbChargerDetector.Reset();
}
else if ( aValue == EChargingStatusNotCharging )
{
--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -271,6 +271,7 @@
TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyCamera") ) );
if ( iCameraSupported && !IsDeviceLocked() && !DoShowKeysLockedNote() )
{
+ iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
ActivateApplicationL( KSysApCamcorderUid );
}
break;
--- a/coreapplicationuis/advancedtspcontroller/group/bld.inf Wed Apr 14 16:08:26 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/group/bld.inf Tue Apr 27 16:49:15 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"
@@ -10,6 +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
@@ -27,14 +28,18 @@
#ifdef RD_TSP_CLIENT_MAPPER
// Rules for media key handling
-../data/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul
-../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul
+/*
+Copy keyevent.rul, keyincall.rul, keyinfmtx.rul to
+1. \epoc32\data\z\private\10282BC4\rules\
+2. \epoc32\release\winscw\udeb\z\private\10282BC4\rules\
+3. \epoc32\release\winscw\urel\z\private\10282BC4\rules\
+*/
+../data/keyevent.rul Z:/private/10282bc4/rules/keyevent.rul
// Call handling rules
-../data/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul
-../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul
+../data/keyincall.rul Z:/private/10282bc4/rules/keyincall.rul
// FM transmitter handling rules
-../data/keyinfmtx.rul /epoc32/data/Z/private/10282bc4/rules/keyinfmtx.rul
-../data/keyinfmtx.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyinfmtx.rul
+../data/keyinfmtx.rul Z:/private/10282bc4/rules/keyinfmtx.rul
+
../rom/advancedtspcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(advancedtspcontroller.iby)
PRJ_MMPFILES
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -161,8 +161,9 @@
file.Flush();
file.Close();
+ dir.Close();
fileSession.Close();
- dir.Close();
+
Swi::RSisRegistrySession session;
CleanupClosePushL(session);
User::LeaveIfError(session.Connect());
--- a/filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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 <e32test.h>
#include <f32file.h>
#include <e32math.h>
+#include <e32def_private.h>
#include "CHtmlToCrtConverter.h"
#include "CHtmlToCrtConvActive.h"
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp Wed Apr 14 16:08:26 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp Tue Apr 27 16:49:15 2010 +0300
@@ -219,8 +219,16 @@
}
else
{
- TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory);
- threshold = iOODWarningThresholdMassMemory;
+ if(iOODWarningThresholdMassMemory < volSize )
+ {
+ TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory);
+ threshold = iOODWarningThresholdMassMemory;
+ }
+ else
+ {
+ TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Phone Memory: Used disk space %d percent",iOODWarningThreshold);
+ threshold = ((volSize*(100-iOODWarningThreshold))/100);
+ }
}
}
}