# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1265064240 -7200 # Node ID 3f7d9dbe57c85476cb22ac2cbfb9da20eae72f0e # Parent 958eca8527ddb19e6bedd12c7103a0c85fd08cea Revision: 201003 Kit: 201005 diff -r 958eca8527dd -r 3f7d9dbe57c8 dcmofw/dcmoclient/group/dcmoclient.mmp --- a/dcmofw/dcmoclient/group/dcmoclient.mmp Tue Jan 26 12:43:57 2010 +0200 +++ b/dcmofw/dcmoclient/group/dcmoclient.mmp Tue Feb 02 00:44:00 2010 +0200 @@ -35,3 +35,5 @@ LIBRARY euser.lib LIBRARY featmgr.lib LIBRARY flogger.lib + +SMPSAFE \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 dcmofw/dcmocustcmd/group/dcmostartupcustcmd.mmp --- a/dcmofw/dcmocustcmd/group/dcmostartupcustcmd.mmp Tue Jan 26 12:43:57 2010 +0200 +++ b/dcmofw/dcmocustcmd/group/dcmostartupcustcmd.mmp Tue Feb 02 00:44:00 2010 +0200 @@ -40,3 +40,5 @@ LIBRARY dcmoclient.lib LIBRARY featmgr.lib DEBUGLIBRARY flogger.lib + +SMPSAFE \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 dcmofw/dcmoserver/group/dcmoserver.mmp --- a/dcmofw/dcmoserver/group/dcmoserver.mmp Tue Jan 26 12:43:57 2010 +0200 +++ b/dcmofw/dcmoserver/group/dcmoserver.mmp Tue Feb 02 00:44:00 2010 +0200 @@ -48,3 +48,5 @@ LIBRARY centralrepository.lib LIBRARY aknnotify.lib eiksrv.lib LIBRARY flogger.lib + +SMPSAFE \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 omaprovisioning/provisioning/help/inc/prov.hlp.hrh --- a/omaprovisioning/provisioning/help/inc/prov.hlp.hrh Tue Jan 26 12:43:57 2010 +0200 +++ b/omaprovisioning/provisioning/help/inc/prov.hlp.hrh Tue Feb 02 00:44:00 2010 +0200 @@ -2,9 +2,9 @@ * 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 the License "Symbian Foundation License v1.0" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* at the URL "http://www.eclipse.org/legal/epl-v10.html". * * Initial Contributors: * Nokia Corporation - initial contribution. diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/group/tarm_policy_conf.cmd --- a/policymanagement/group/tarm_policy_conf.cmd Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/group/tarm_policy_conf.cmd Tue Feb 02 00:44:00 2010 +0200 @@ -17,9 +17,14 @@ echo * Policy file configure * echo ************************* + + set policy_dir=policies if not "%1"=="" set policy_dir=%1 +if not exist \epoc32\data\Z\private\10207815\thirdpartypolicy.txt ( + + call md \epoc32\data\Z\private\10207815 call del /q \epoc32\data\Z\private\10207815\*.* call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\data\Z\private\10207815 @@ -27,6 +32,7 @@ call md \epoc32\release\winscw\udeb\Z\private\10207815 call del /q \epoc32\release\winscw\udeb\Z\private\10207815\*.* call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\winscw\udeb\Z\private\10207815 + call md \epoc32\release\winscw\urel\Z\private\10207815 call del /q \epoc32\release\winscw\urel\Z\private\10207815\*.* call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\winscw\urel\Z\private\10207815 @@ -34,6 +40,9 @@ call md \epoc32\release\armv5\udeb\Z\private\10207815 call del /q \epoc32\release\armv5\udeb\Z\private\10207815\*.* call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\armv5\udeb\Z\private\10207815 + call md \epoc32\release\armv5\urel\Z\private\10207815 call del /q \epoc32\release\armv5\urel\Z\private\10207815\*.* call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\armv5\urel\Z\private\10207815 + +) \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000000257.txt --- a/policymanagement/policyengine/Data/policies/0000000257.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000000257.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -|535|768|1281|9729|11009 \ No newline at end of file +|535|768|1281|10497|11777 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000001281.txt --- a/policymanagement/policyengine/Data/policies/0000001281.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000001281.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -|1559|1793|8960~257 \ No newline at end of file +|1559|1793|9728~257 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000001793.txt --- a/policymanagement/policyengine/Data/policies/0000001793.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000001793.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -|2071|2304|3072|3840|4608|5376|6144|6912|7936~1281 \ No newline at end of file +|2071|2304|3072|3840|4608|5376|6144|6912|7936|8960~1281 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000008960.txt --- a/policymanagement/policyengine/Data/policies/0000008960.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000008960.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -|9239 TerminalSecurityManagement |9492~1281 \ No newline at end of file +|9239 DCMOEnforcement |9492~1793 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000009239.txt --- a/policymanagement/policyengine/Data/policies/0000009239.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000009239.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -Terminal control enforcement policy. This policy is used for enforcing Terminal Control. \ No newline at end of file +DCMO policy. This policy is used for DCMO settings. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000009492.txt --- a/policymanagement/policyengine/Data/policies/0000009492.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000009492.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -~8960 \ No newline at end of file +~8960 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000009728.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000009728.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|10007 TerminalSecurityManagement |10260~1281 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000009729.txt --- a/policymanagement/policyengine/Data/policies/0000009729.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|9984|10496~257 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000009984.txt --- a/policymanagement/policyengine/Data/policies/0000009984.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - DeviceLockPasscodeVisibility |10260~9729 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000010007.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000010007.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +Terminal control enforcement policy. This policy is used for enforcing Terminal Control. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000010260.txt --- a/policymanagement/policyengine/Data/policies/0000010260.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000010260.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -~9984 \ No newline at end of file +~9728 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000010496.txt --- a/policymanagement/policyengine/Data/policies/0000010496.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - ThirdPartySecureIds |10772~9729 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000010497.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000010497.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|10752|11264~257 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000010752.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000010752.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + DeviceLockPasscodeVisibility |11028~10497 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000010772.txt --- a/policymanagement/policyengine/Data/policies/0000010772.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -~10496 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011009.txt --- a/policymanagement/policyengine/Data/policies/0000011009.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|11287|11520|12289~257 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011028.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000011028.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +~10752 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011264.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000011264.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + ThirdPartySecureIds |11540~10497 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011287.txt --- a/policymanagement/policyengine/Data/policies/0000011287.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -Meta policy set policies. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011520.txt --- a/policymanagement/policyengine/Data/policies/0000011520.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|11799|12052~11009 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011540.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000011540.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +~11264 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011777.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000011777.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|12055|12288|13057~257 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000011799.txt --- a/policymanagement/policyengine/Data/policies/0000011799.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -This policy defines who has rights to modify certificate mapping policies. Currentlyonly certificate owner can edit mapping rules! \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012052.txt --- a/policymanagement/policyengine/Data/policies/0000012052.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - cert_mapping_policy ~11520 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012055.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000012055.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +Meta policy set policies. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012288.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000012288.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|12567|12820~11777 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012289.txt --- a/policymanagement/policyengine/Data/policies/0000012289.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|12567|12800|13312|14336|17408~11009 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012567.txt --- a/policymanagement/policyengine/Data/policies/0000012567.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000012567.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ -Trustedadmin meta policy set policies. \ No newline at end of file +This policy defines who has rights to modify certificate mapping policies. Currentlyonly certificate owner can edit mapping rules! \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012800.txt --- a/policymanagement/policyengine/Data/policies/0000012800.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|13079~12289 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000012820.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000012820.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + cert_mapping_policy ~12288 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013057.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000013057.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|13335|13568|14080|15104|18432~11777 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013079.txt --- a/policymanagement/policyengine/Data/policies/0000013079.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -Roles policy. This metapolicy is used for controlling roles in policy system. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013312.txt --- a/policymanagement/policyengine/Data/policies/0000013312.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|13591|13844|14100~12289 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013335.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000013335.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +Trustedadmin meta policy set policies. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013568.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000013568.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|13847~13057 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013591.txt --- a/policymanagement/policyengine/Data/policies/0000013591.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -Initial trustedadmin Policy. This policy grants trustedadmin Policy Rights to trustedadmin. This is requested from user. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013844.txt --- a/policymanagement/policyengine/Data/policies/0000013844.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - add roles_mapping_policy subjecttrusted_subjectanysubjecturn:nokia:names:s60:corporate:1.0:subject:role_idtrustedadmin~13312 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000013847.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000013847.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +Roles policy. This metapolicy is used for controlling roles in policy system. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014080.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000014080.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|14359|14612|14868~13057 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014100.txt --- a/policymanagement/policyengine/Data/policies/0000014100.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - trustedadmin remove roles_mapping_policy ~13312 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014336.txt --- a/policymanagement/policyengine/Data/policies/0000014336.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|14615 trustedadmin add remove replace |14868|15124|15380|15636|15892|16148|16404|16660|16916|17172~12289 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014359.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000014359.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +Initial trustedadmin Policy. This policy grants trustedadmin Policy Rights to trustedadmin. This is requested from user. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014612.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000014612.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + add roles_mapping_policy subjecttrusted_subjectanysubjecturn:nokia:names:s60:corporate:1.0:subject:role_idtrustedadmin~14080 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014615.txt --- a/policymanagement/policyengine/Data/policies/0000014615.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -trustedadmin Meta Policy. This metapolicy is used for controlling enforcement policies in policy system. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000014868.txt --- a/policymanagement/policyengine/Data/policies/0000014868.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000014868.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - wlan_enforcement_policy ~14336 \ No newline at end of file + trustedadmin remove roles_mapping_policy ~14080 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000015104.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000015104.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|15383 trustedadmin add remove replace |15636|15892|16148|16404|16660|16916|17172|17428|17684|17940|18196~13057 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000015124.txt --- a/policymanagement/policyengine/Data/policies/0000015124.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - datasync_enforcement_policy ~14336 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000015380.txt --- a/policymanagement/policyengine/Data/policies/0000015380.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - syncml_enforcement_policy ~14336 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000015383.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000015383.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +trustedadmin Meta Policy. This metapolicy is used for controlling enforcement policies in policy system. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000015636.txt --- a/policymanagement/policyengine/Data/policies/0000015636.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000015636.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - email_enforcement_policy ~14336 \ No newline at end of file + wlan_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000015892.txt --- a/policymanagement/policyengine/Data/policies/0000015892.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000015892.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - im_enforcement_policy ~14336 \ No newline at end of file + datasync_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000016148.txt --- a/policymanagement/policyengine/Data/policies/0000016148.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000016148.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - ap_enforcement_policy ~14336 \ No newline at end of file + syncml_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000016404.txt --- a/policymanagement/policyengine/Data/policies/0000016404.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000016404.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - customization_management_enforcement_policy ~14336 \ No newline at end of file + email_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000016660.txt --- a/policymanagement/policyengine/Data/policies/0000016660.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000016660.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - application_management_enforcement_policy ~14336 \ No newline at end of file + im_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000016916.txt --- a/policymanagement/policyengine/Data/policies/0000016916.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000016916.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - terminal_security_management_enforcement_policy ~14336 \ No newline at end of file + ap_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000017172.txt --- a/policymanagement/policyengine/Data/policies/0000017172.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000017172.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - thirdparty_secure_ids_policy ~14336 \ No newline at end of file + customization_management_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000017408.txt --- a/policymanagement/policyengine/Data/policies/0000017408.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -|17687 add remove replace |17940~12289 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000017428.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000017428.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + application_management_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000017684.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000017684.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + terminal_security_management_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000017687.txt --- a/policymanagement/policyengine/Data/policies/0000017687.txt Tue Jan 26 12:43:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -Application Meta Policy. This metapolicy is used for giving policy modifing right for applications. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000017940.txt --- a/policymanagement/policyengine/Data/policies/0000017940.txt Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/Data/policies/0000017940.txt Tue Feb 02 00:44:00 2010 +0200 @@ -1,1 +1,1 @@ - SECUREID[10207836] device_lock_passcode_visibility_policy ~17408 \ No newline at end of file + thirdparty_secure_ids_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000018196.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000018196.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + dcmo_enforcement_policy ~15104 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000018432.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000018432.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +|18711 add remove replace |18964~13057 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000018711.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000018711.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ +Application Meta Policy. This metapolicy is used for giving policy modifing right for applications. \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/Data/policies/0000018964.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/Data/policies/0000018964.txt Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,1 @@ + SECUREID[10207836] device_lock_passcode_visibility_policy ~18432 \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/group/PolicyEngineServer.mmp --- a/policymanagement/policyengine/group/PolicyEngineServer.mmp Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/group/PolicyEngineServer.mmp Tue Feb 02 00:44:00 2010 +0200 @@ -41,7 +41,7 @@ SOURCE CommsDatEnforcement.cpp SOURCE datasyncmlenforcement.cpp SOURCE IMEnforcement.cpp - +SOURCE dcmoenforcement.cpp USERINCLUDE . ../policyengineserver/inc USERINCLUDE ../policyengineclient/inc diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/group/bld.inf --- a/policymanagement/policyengine/group/bld.inf Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/group/bld.inf Tue Feb 02 00:44:00 2010 +0200 @@ -33,7 +33,7 @@ ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/armv5/udeb/z/private/1020783f/format_e_.txt ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/armv5/urel/z/private/1020783f/format_e_.txt -../rom/pe_data.iby CORE_MW_LAYER_IBY_EXPORT_PATH(pe_data.iby) +../rom/pe_data.iby CORE_MW_LAYER_IBY_EXPORT_PATH(pe_data_s60.iby) ../rom/policyengine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(policyengine.iby) ../rom/policyengineresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(policyengineresources.iby) ../policyengineui/loc/PolicyEngineUI.loc MW_LAYER_LOC_EXPORT_PATH(policyengineui.loc) diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/policyengineclient/inc/EnforcementConstants.h --- a/policymanagement/policyengine/policyengineclient/inc/EnforcementConstants.h Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/policyengineclient/inc/EnforcementConstants.h Tue Feb 02 00:44:00 2010 +0200 @@ -29,6 +29,7 @@ _LIT8( KTerminalSecurityURI, "TerminalSecurity"); _LIT8( KApplicationManagementURI, "SCM"); _LIT8( KSCOMOURI, "SCOMO"); +_LIT8( KDCMOURI, "DCMO"); #endif /*ENFORCEMENTCONSTANTS_H_*/ diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/policyengineclient/src/Contexts.cpp --- a/policymanagement/policyengine/policyengineclient/src/Contexts.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/policyengineclient/src/Contexts.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -433,6 +433,11 @@ enforcementType = EApplicationManagement; resourceType.Set(PolicyEngineXACML::KApplicationManagement); } + else if(0 == segmentName.Compare(KDCMOURI)) + { + enforcementType = EDCMOEnforcement; + resourceType.Set(PolicyEngineXACML::KDCMOEnforcement); + } else { diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/policyengineserver/inc/XACMLconstants.h --- a/policymanagement/policyengine/policyengineserver/inc/XACMLconstants.h Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/policyengineserver/inc/XACMLconstants.h Tue Feb 02 00:44:00 2010 +0200 @@ -59,6 +59,7 @@ _LIT8( EDataSyncEnforcementPolicy, "datasync_enforcement_policy"); _LIT8( ESyncMLEnforcementPolicy, "syncml_enforcement_policy"); _LIT8( EIMEnforcementPolicy, "im_enforcement_policy"); + _LIT8( EDCMOEnforcementPolicy, "dcmo_enforcement_policy"); //values used in RuleTargetCheck functions _LIT8( Any, "any"); diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/policyengineserver/inc/dcmoenforcement.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/policyengineserver/inc/dcmoenforcement.h Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,69 @@ +/* +* 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" +* 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: Implementation of policymanagement component for DCMO enforcement +* +*/ + + +#ifndef __DCMO_ENFORCEMENT_HEADER__ +#define __DCMO_ENFORCEMENT_HEADER__ + +// INCLUDES + +#include +#include +#include "SettingEnforcementManager.h" +#include "CentRepToolClient.h" +#include "DMUtilClient.h" + +// ----------------------------------------------------------------------------- +// Class CDcmoEnforcement +// ----------------------------------------------------------------------------- +// +class CDcmoEnforcement : public CEnforcementBase +{ + public: + //construction + CDcmoEnforcement(); + virtual ~CDcmoEnforcement(); + static CDcmoEnforcement* NewL( const TDesC8& aEnforcementId ); + + //from MEnforcementBase + void InitEnforcementL( TRequestStatus& aRequestStatus); + void DoEnforcementL( TRequestStatus& aRequestStatus); + TBool InitReady(); + TBool EnforcementReady(); + void FinishEnforcementL( TBool aFlushSettings); + void ResetEnforcementL(); + + void AccessRightList( RAccessControlList& aAccessControlList); + + static TBool ValidEnforcementElement( const TDesC8& aEnforcementId); + private: + //active state + TInt iInitState; + TInt iEnforcementState; + + //editor list + RAccessControlList* iAccessControlList; + + //ACL editing + RDMUtil iDMUtil; + + KSettingEnforcements iSettingType; + +}; + + +#endif \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp --- a/policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -23,6 +23,7 @@ #include "EMailEnforcement.h" #include "CommsDatEnforcement.h" #include "IMEnforcement.h" +#include "dcmoenforcement.h" #include "datasyncmlenforcement.h" #include "ElementBase.h" #include "PolicyStorage.h" @@ -121,7 +122,8 @@ if ( CEmailEnforcement::ValidEnforcementElement( *elementName) || CCommsDatEnforcement::ValidEnforcementElement( *elementName) || CDataSyncMLEnforcement::ValidEnforcementElement( *elementName) || - CImEnforcement::ValidEnforcementElement(*elementName)) + CImEnforcement::ValidEnforcementElement(*elementName) || + CDcmoEnforcement::ValidEnforcementElement(*elementName)) { iEnforcementElements.AppendL( elementName->Alloc()); } @@ -315,6 +317,11 @@ iActiveEnforcementBase = CImEnforcement::NewL( aEnforcementId); } + if ( !iActiveEnforcementBase) + { + iActiveEnforcementBase = CDcmoEnforcement::NewL( aEnforcementId); + } + if ( iActiveEnforcementBase ) { iActiveEnforcementBase->AccessRightList( iValidEditorsForSetting); diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/policyengineserver/src/dcmoenforcement.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policymanagement/policyengine/policyengineserver/src/dcmoenforcement.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -0,0 +1,215 @@ +/* +* 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" +* 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: Implementation of policymanagement component for DCMO enforcement +* +*/ + + +// INCLUDE FILES + +#include "dcmoenforcement.h" +#include "XACMLconstants.h" +#include "debug.h" +#include "PolicyEngineServer.h" +#include "PolicyStorage.h" + +// EXTERNAL DATA STRUCTURES +// EXTERNAL FUNCTION PROTOTYPES +// CONSTANTS + +_LIT8( KDCMOURI, "DCMO"); + +// MACROS +// LOCAL CONSTANTS AND MACROS +// MODULE DATA STRUCTURES +// LOCAL FUNCTION PROTOTYPES + + +// ==================== LOCAL FUNCTIONS ==================== + +// ================= MEMBER FUNCTIONS ======================= + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::CDcmoEnforcement() +// ----------------------------------------------------------------------------- +// + +CDcmoEnforcement::CDcmoEnforcement() +{ +RDEBUG("CDcmoEnforcement::CDcmoEnforcement()"); +} + + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::~CDcmoEnforcement() +// ----------------------------------------------------------------------------- +// + +CDcmoEnforcement::~CDcmoEnforcement() +{ + RDEBUG("CDcmoEnforcement::~CDcmoEnforcement()"); + iDMUtil.Close(); +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::NewL() +// ----------------------------------------------------------------------------- +// + +CDcmoEnforcement* CDcmoEnforcement::NewL( const TDesC8& aEnforcementId ) +{ + CDcmoEnforcement* self = 0; + + if ( aEnforcementId == PolicyLanguage::Constants::EDCMOEnforcementPolicy ) + { + RDEBUG(" -> New DCMOEnforcementPolicy"); + self = new (ELeave) CDcmoEnforcement(); + self->iSettingType = EDCMOEnforcement; + } + + return self; +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::ValidEnforcementElement() +// ----------------------------------------------------------------------------- +// +TBool CDcmoEnforcement::ValidEnforcementElement( const TDesC8& aEnforcementId) +{ + RDEBUG("CDcmoEnforcement::ValidEnforcementElement"); + if ( aEnforcementId == PolicyLanguage::Constants::EDCMOEnforcementPolicy ) + { + return ETrue; + } + + return EFalse; +} + + + + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::InitEnforcement() +// ----------------------------------------------------------------------------- +// + +void CDcmoEnforcement::InitEnforcementL( TRequestStatus& aRequestStatus) +{ + RDEBUG("CDcmoEnforcement::InitEnforcementL"); + //connect to server + User::LeaveIfError( iDMUtil.Connect()); + + iInitState++; + + //complete request + TRequestStatus * status = &aRequestStatus; + User::RequestComplete( status, KErrNone); +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::InitReady() +// ----------------------------------------------------------------------------- +// + +TBool CDcmoEnforcement::InitReady() +{ + return iInitState; +} + + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::DoEnforcementL() +// ----------------------------------------------------------------------------- +// + +void CDcmoEnforcement::DoEnforcementL( TRequestStatus& aRequestStatus) +{ + RDEBUG("CDcmoEnforcement::DoEnforcementL()"); + + if ( iAccessControlList->Count()) + { + //ACL... + User::LeaveIfError( iDMUtil.SetMngSessionCertificate( SessionCertificate())); + User::LeaveIfError( iDMUtil.AddACLForNode( KDCMOURI, EForChildrens, EACLDelete)); + User::LeaveIfError( iDMUtil.AddACLForNode( KDCMOURI, EForNode, EACLGet ) ); + User::LeaveIfError( iDMUtil.SetACLForNode( KDCMOURI, EForNode, EACLAdd)); + User::LeaveIfError( iDMUtil.SetACLForNode( KDCMOURI, EForNode, EACLExec)); + + CPolicyStorage::PolicyStorage()->ActivateEnforcementFlagL( iSettingType); + } + else + { + CPolicyStorage::PolicyStorage()->DeactivateEnforcementFlagL( iSettingType); + + //ACL... + User::LeaveIfError( iDMUtil.RemoveACL( KDCMOURI, ETrue)); + + } + + iEnforcementState++; + TRequestStatus * status = &aRequestStatus; + User::RequestComplete( status, KErrNone); +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::EnforcementReady() +// ----------------------------------------------------------------------------- +// +TBool CDcmoEnforcement::EnforcementReady() +{ + return iEnforcementState > 0; +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::FinishEnforcementL() +// ----------------------------------------------------------------------------- +// +void CDcmoEnforcement::FinishEnforcementL( TBool aFlushSettings) +{ + RDEBUG("CDcmoEnforcement::FinishEnforcementL"); + //Close sessions + if (aFlushSettings) + { + iDMUtil.Flush(); + } + + iDMUtil.Close(); +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::AccessRightList() +// ----------------------------------------------------------------------------- +// +void CDcmoEnforcement::AccessRightList( RAccessControlList& aAccessControlList) +{ + iAccessControlList = &aAccessControlList; +} + +// ----------------------------------------------------------------------------- +// CDcmoEnforcement::ResetEnforcementL() +// ----------------------------------------------------------------------------- +// +void CDcmoEnforcement::ResetEnforcementL() +{ + RDEBUG("CDcmoEnforcement::ResetEnforcementL()"); + CPolicyStorage::PolicyStorage()->DeactivateEnforcementFlagL( EDCMOEnforcement); + + User::LeaveIfError( iDMUtil.Connect()); + CleanupClosePushL( iDMUtil); + + //ACL... + User::LeaveIfError( iDMUtil.RemoveACL( KDCMOURI, ETrue ) ); + + CleanupStack::PopAndDestroy( &iDMUtil); +} diff -r 958eca8527dd -r 3f7d9dbe57c8 policymanagement/policyengine/rom/pe_data.iby --- a/policymanagement/policyengine/rom/pe_data.iby Tue Jan 26 12:43:57 2010 +0200 +++ b/policymanagement/policyengine/rom/pe_data.iby Tue Feb 02 00:44:00 2010 +0200 @@ -19,8 +19,6 @@ //Policy engine data files -//#if defined(__SAP_POLICY_MANAGEMENT) - data=ZPRIVATE\10207815\0000000535.txt private\10207815\0000000535.txt data=ZPRIVATE\10207815\0000001047.txt private\10207815\0000001047.txt data=ZPRIVATE\10207815\0000000768.txt private\10207815\0000000768.txt @@ -52,31 +50,31 @@ data=ZPRIVATE\10207815\0000008468.txt private\10207815\0000008468.txt data=ZPRIVATE\10207815\0000008724.txt private\10207815\0000008724.txt data=ZPRIVATE\10207815\0000007936.txt private\10207815\0000007936.txt -data=ZPRIVATE\10207815\0000001793.txt private\10207815\0000001793.txt data=ZPRIVATE\10207815\0000009239.txt private\10207815\0000009239.txt data=ZPRIVATE\10207815\0000009492.txt private\10207815\0000009492.txt data=ZPRIVATE\10207815\0000008960.txt private\10207815\0000008960.txt -data=ZPRIVATE\10207815\0000001281.txt private\10207815\0000001281.txt +data=ZPRIVATE\10207815\0000001793.txt private\10207815\0000001793.txt +data=ZPRIVATE\10207815\0000010007.txt private\10207815\0000010007.txt data=ZPRIVATE\10207815\0000010260.txt private\10207815\0000010260.txt -data=ZPRIVATE\10207815\0000009984.txt private\10207815\0000009984.txt -data=ZPRIVATE\10207815\0000010772.txt private\10207815\0000010772.txt -data=ZPRIVATE\10207815\0000010496.txt private\10207815\0000010496.txt -data=ZPRIVATE\10207815\0000009729.txt private\10207815\0000009729.txt -data=ZPRIVATE\10207815\0000011287.txt private\10207815\0000011287.txt -data=ZPRIVATE\10207815\0000011799.txt private\10207815\0000011799.txt -data=ZPRIVATE\10207815\0000012052.txt private\10207815\0000012052.txt -data=ZPRIVATE\10207815\0000011520.txt private\10207815\0000011520.txt +data=ZPRIVATE\10207815\0000009728.txt private\10207815\0000009728.txt +data=ZPRIVATE\10207815\0000001281.txt private\10207815\0000001281.txt +data=ZPRIVATE\10207815\0000011028.txt private\10207815\0000011028.txt +data=ZPRIVATE\10207815\0000010752.txt private\10207815\0000010752.txt +data=ZPRIVATE\10207815\0000011540.txt private\10207815\0000011540.txt +data=ZPRIVATE\10207815\0000011264.txt private\10207815\0000011264.txt +data=ZPRIVATE\10207815\0000010497.txt private\10207815\0000010497.txt +data=ZPRIVATE\10207815\0000012055.txt private\10207815\0000012055.txt data=ZPRIVATE\10207815\0000012567.txt private\10207815\0000012567.txt -data=ZPRIVATE\10207815\0000013079.txt private\10207815\0000013079.txt -data=ZPRIVATE\10207815\0000012800.txt private\10207815\0000012800.txt -data=ZPRIVATE\10207815\0000013591.txt private\10207815\0000013591.txt -data=ZPRIVATE\10207815\0000013844.txt private\10207815\0000013844.txt -data=ZPRIVATE\10207815\0000014100.txt private\10207815\0000014100.txt -data=ZPRIVATE\10207815\0000013312.txt private\10207815\0000013312.txt -data=ZPRIVATE\10207815\0000014615.txt private\10207815\0000014615.txt +data=ZPRIVATE\10207815\0000012820.txt private\10207815\0000012820.txt +data=ZPRIVATE\10207815\0000012288.txt private\10207815\0000012288.txt +data=ZPRIVATE\10207815\0000013335.txt private\10207815\0000013335.txt +data=ZPRIVATE\10207815\0000013847.txt private\10207815\0000013847.txt +data=ZPRIVATE\10207815\0000013568.txt private\10207815\0000013568.txt +data=ZPRIVATE\10207815\0000014359.txt private\10207815\0000014359.txt +data=ZPRIVATE\10207815\0000014612.txt private\10207815\0000014612.txt data=ZPRIVATE\10207815\0000014868.txt private\10207815\0000014868.txt -data=ZPRIVATE\10207815\0000015124.txt private\10207815\0000015124.txt -data=ZPRIVATE\10207815\0000015380.txt private\10207815\0000015380.txt +data=ZPRIVATE\10207815\0000014080.txt private\10207815\0000014080.txt +data=ZPRIVATE\10207815\0000015383.txt private\10207815\0000015383.txt data=ZPRIVATE\10207815\0000015636.txt private\10207815\0000015636.txt data=ZPRIVATE\10207815\0000015892.txt private\10207815\0000015892.txt data=ZPRIVATE\10207815\0000016148.txt private\10207815\0000016148.txt @@ -84,14 +82,18 @@ data=ZPRIVATE\10207815\0000016660.txt private\10207815\0000016660.txt data=ZPRIVATE\10207815\0000016916.txt private\10207815\0000016916.txt data=ZPRIVATE\10207815\0000017172.txt private\10207815\0000017172.txt -data=ZPRIVATE\10207815\0000014336.txt private\10207815\0000014336.txt -data=ZPRIVATE\10207815\0000017687.txt private\10207815\0000017687.txt +data=ZPRIVATE\10207815\0000017428.txt private\10207815\0000017428.txt +data=ZPRIVATE\10207815\0000017684.txt private\10207815\0000017684.txt data=ZPRIVATE\10207815\0000017940.txt private\10207815\0000017940.txt -data=ZPRIVATE\10207815\0000017408.txt private\10207815\0000017408.txt -data=ZPRIVATE\10207815\0000012289.txt private\10207815\0000012289.txt -data=ZPRIVATE\10207815\0000011009.txt private\10207815\0000011009.txt +data=ZPRIVATE\10207815\0000018196.txt private\10207815\0000018196.txt +data=ZPRIVATE\10207815\0000015104.txt private\10207815\0000015104.txt +data=ZPRIVATE\10207815\0000018711.txt private\10207815\0000018711.txt +data=ZPRIVATE\10207815\0000018964.txt private\10207815\0000018964.txt +data=ZPRIVATE\10207815\0000018432.txt private\10207815\0000018432.txt +data=ZPRIVATE\10207815\0000013057.txt private\10207815\0000013057.txt +data=ZPRIVATE\10207815\0000011777.txt private\10207815\0000011777.txt data=ZPRIVATE\10207815\0000000257.txt private\10207815\0000000257.txt -//#endif #endif + \ No newline at end of file diff -r 958eca8527dd -r 3f7d9dbe57c8 remotemgmt_plat/policy_management_request_api/inc/PolicyEngineXACML.h --- a/remotemgmt_plat/policy_management_request_api/inc/PolicyEngineXACML.h Tue Jan 26 12:43:57 2010 +0200 +++ b/remotemgmt_plat/policy_management_request_api/inc/PolicyEngineXACML.h Tue Feb 02 00:44:00 2010 +0200 @@ -55,6 +55,7 @@ _LIT8( KInstantMessagingEnforcemnt, "InstantMessagingEnforcemnt"); _LIT8( KThirdPartySecureIds, "ThirdPartySecureIds"); _LIT8( KDeviceLockPasscodeVisibility, "DeviceLockPasscodeVisibility"); + _LIT8( KDCMOEnforcement, "DCMOEnforcement"); } diff -r 958eca8527dd -r 3f7d9dbe57c8 remotemgmt_plat/setting_enforcement_info_api/inc/SettingEnforcementInfo.h --- a/remotemgmt_plat/setting_enforcement_info_api/inc/SettingEnforcementInfo.h Tue Jan 26 12:43:57 2010 +0200 +++ b/remotemgmt_plat/setting_enforcement_info_api/inc/SettingEnforcementInfo.h Tue Feb 02 00:44:00 2010 +0200 @@ -36,7 +36,8 @@ EIMEnforcement, ECustomization, ETerminalSecurity, - EApplicationManagement + EApplicationManagement, + EDCMOEnforcement }; diff -r 958eca8527dd -r 3f7d9dbe57c8 syncmlfw/common/http/inc/nsmlhttp.h --- a/syncmlfw/common/http/inc/nsmlhttp.h Tue Jan 26 12:43:57 2010 +0200 +++ b/syncmlfw/common/http/inc/nsmlhttp.h Tue Feb 02 00:44:00 2010 +0200 @@ -41,6 +41,10 @@ #include "nsmldialiap.h" #include +#include + +//Central repository key for varying deflate feature +const TInt KNsmlDsDeflateSupport = 0xA ; // FORWARD DECLARATION class CNSmlXptShutdownTimer; @@ -170,6 +174,7 @@ TServerContentEncoding iServerContentEncoding; TServerContentEncoding iServerAcceptEncoding; TInt iMaxMsgSize; + TBool iDeflateFlag; private: // methods inherited from MHTTPDataSupplier diff -r 958eca8527dd -r 3f7d9dbe57c8 syncmlfw/common/http/src/nsmlhttp.cpp --- a/syncmlfw/common/http/src/nsmlhttp.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/syncmlfw/common/http/src/nsmlhttp.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -22,6 +22,7 @@ #include #include #include "nsmlprivatepskeys.h" +#include #include "nsmlerror.h" @@ -143,6 +144,16 @@ iMaxMsgSize = value; } } + + CRepository* rep = CRepository::NewLC(KCRUidNSmlDSEngine); + TInt flag(0); + TRAPD(err, rep->Get(KNsmlDsDeflateSupport, flag)); + DBG_FILE_CODE(flag, _S8("Flag value")); + if ( err == KErrNone ) + { + iDeflateFlag = flag; + } + CleanupStack::PopAndDestroy(rep); } // --------------------------------------------------------- @@ -565,7 +576,7 @@ delete iReqBodySubmitBuffer; iReqBodySubmitBuffer = NULL; - if( (iSession == ESyncMLDSSession) && (iServerAcceptEncoding == ExptDeflate) ) + if( (iSession == ESyncMLDSSession) && (iServerAcceptEncoding == ExptDeflate) && iDeflateFlag ) { TRAPD( err, CompressL(aStartPtr) ); User::LeaveIfError( err ); @@ -1070,13 +1081,13 @@ SetHeaderL( hdr, HTTP::EAcceptCharset, KSmlAcceptCharSet ); SetHeaderL( hdr, HTTP::EAcceptLanguage , KSmlAcceptLanguage ); - if( iSession == ESyncMLDSSession )//for ds session - { + if( iSession == ESyncMLDSSession && iDeflateFlag )//for ds session + { if(iServerAcceptEncoding == ExptDeflate) - { - SetHeaderL( hdr, HTTP::EContentEncoding , KSmlContentDeflate ); - } - SetHeaderL( hdr, HTTP::EAcceptEncoding , KSmlContentDeflate ); + { + SetHeaderL( hdr, HTTP::EContentEncoding , KSmlContentDeflate ); + } + SetHeaderL( hdr, HTTP::EAcceptEncoding , KSmlContentDeflate ); } // Add headers and body data for methods that use request bodies @@ -1135,7 +1146,7 @@ } else { - if ( (iSession == ESyncMLDSSession) && (iServerContentEncoding == ExptDeflate) ) + if ( (iSession == ESyncMLDSSession) && (iServerContentEncoding == ExptDeflate) && iDeflateFlag ) { TRAPD( err, DecompressL( aStartPtr ) ); User::LeaveIfError( err ); diff -r 958eca8527dd -r 3f7d9dbe57c8 syncmlfw/common/http/src/nsmlhttpclient.cpp --- a/syncmlfw/common/http/src/nsmlhttpclient.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/syncmlfw/common/http/src/nsmlhttpclient.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -141,32 +141,31 @@ break; } - if(this->iAgent->iSession == ESyncMLDSSession) + if(this->iAgent->iSession == ESyncMLDSSession && this->iAgent->iDeflateFlag ) { - RStringF serverContentEncoding = strPool.OpenFStringL( KSmlContentEncodingType ); - THTTPHdrVal serverContentEncodingValue; - if(hdr.GetField( serverContentEncoding, 0, serverContentEncodingValue ) != KErrNotFound) - { - RStringF fieldServerContentEncodingValStr = strPool.StringF( serverContentEncodingValue.StrF() ); - const TDesC8& serverContentEncodingStr = fieldServerContentEncodingValStr.DesC(); - if( serverContentEncodingStr == KSmlContentDeflate) - { - this->iAgent->iServerContentEncoding = CNSmlHTTP::ExptDeflate; - } - } - - RStringF serverAcceptEncoding = strPool.OpenFStringL( KSmlAcceptEncodingType ); - THTTPHdrVal serverAcceptEncodingValue; - if(hdr.GetField( serverAcceptEncoding, 0, serverAcceptEncodingValue ) != KErrNotFound ) - { - RStringF fieldServerAcceptEncodingValStr = strPool.StringF( serverAcceptEncodingValue.StrF() ); - const TDesC8& serverAcceptEncodingStr = fieldServerAcceptEncodingValStr.DesC(); - if( serverAcceptEncodingStr.Find(KSmlContentDeflate) != KErrNotFound) - { - this->iAgent->iServerAcceptEncoding = CNSmlHTTP::ExptDeflate; - } - } - } + RStringF serverContentEncoding = strPool.OpenFStringL( KSmlContentEncodingType ); + THTTPHdrVal serverContentEncodingValue; + if(hdr.GetField( serverContentEncoding, 0, serverContentEncodingValue ) != KErrNotFound) + { + RStringF fieldServerContentEncodingValStr = strPool.StringF( serverContentEncodingValue.StrF() ); + const TDesC8& serverContentEncodingStr = fieldServerContentEncodingValStr.DesC(); + if( serverContentEncodingStr == KSmlContentDeflate) + { + this->iAgent->iServerContentEncoding = CNSmlHTTP::ExptDeflate; + } + } + RStringF serverAcceptEncoding = strPool.OpenFStringL( KSmlAcceptEncodingType ); + THTTPHdrVal serverAcceptEncodingValue; + if(hdr.GetField( serverAcceptEncoding, 0, serverAcceptEncodingValue ) != KErrNotFound ) + { + RStringF fieldServerAcceptEncodingValStr = strPool.StringF( serverAcceptEncodingValue.StrF() ); + const TDesC8& serverAcceptEncodingStr = fieldServerAcceptEncodingValStr.DesC(); + if( serverAcceptEncodingStr.Find(KSmlContentDeflate) != KErrNotFound) + { + this->iAgent->iServerAcceptEncoding = CNSmlHTTP::ExptDeflate; + } + } + } if ( status == 200 ) { diff -r 958eca8527dd -r 3f7d9dbe57c8 syncmlfw/conf/datasync.confml Binary file syncmlfw/conf/datasync.confml has changed diff -r 958eca8527dd -r 3f7d9dbe57c8 syncmlfw/conf/datasync_2000CF7E.crml Binary file syncmlfw/conf/datasync_2000CF7E.crml has changed diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/inc/DmEventNotifierDebug.h --- a/terminalsecurity/SCP/DmEventNotifier/inc/DmEventNotifierDebug.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/inc/DmEventNotifierDebug.h Tue Feb 02 00:44:00 2010 +0200 @@ -36,16 +36,13 @@ #if defined (_DEBUG) #if defined(__WINS__) - #define FLOG RDebug::Print - #define FLOG(arg...) RDebug::Print(arg); + #define _DMEVNT_DEBUG(arg...) RDebug::Print(arg); #else - #define FLOG FWrite - #define FLOG(arg...) FWrite(arg); + #define _DMEVNT_DEBUG(arg...) FWrite(arg); #endif #else - #define FLOG - #define FLOG(arg...) + #define _DMEVNT_DEBUG(arg...) #endif //_DEBUG #endif // __DMEVENTNOTIFIERDEBUG_H__ diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/inc/DmEventNotifierInternal.h --- a/terminalsecurity/SCP/DmEventNotifier/inc/DmEventNotifierInternal.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/inc/DmEventNotifierInternal.h Tue Feb 02 00:44:00 2010 +0200 @@ -32,7 +32,7 @@ #include "DmEventNotifierCRKeys.h" //Defines -#define __LEAVE_IF_ERROR(x) if(KErrNone!=x) {FLOG(_L("LEAVE in %s: %d"), __FILE__, __LINE__); User::Leave(x); } +#define __LEAVE_IF_ERROR(x) if(KErrNone!=x) {_DMEVNT_DEBUG(_L("LEAVE in %s: %d"), __FILE__, __LINE__); User::Leave(x); } //Size of the schedule condition array #define KConditionArraySize 1 diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/inc/DmEventScheduler.h --- a/terminalsecurity/SCP/DmEventNotifier/inc/DmEventScheduler.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/inc/DmEventScheduler.h Tue Feb 02 00:44:00 2010 +0200 @@ -90,7 +90,7 @@ * @param aTaskName - Name of the task * @return None. Can leave with system wide error */ - void WaitAndCreateConditionScheduleL(TName aTaskName); + void WaitAndCreateConditionScheduleL(TName& aTaskName); private: diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/inc/JavaApplicationService.h --- a/terminalsecurity/SCP/DmEventNotifier/inc/JavaApplicationService.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/inc/JavaApplicationService.h Tue Feb 02 00:44:00 2010 +0200 @@ -49,9 +49,9 @@ public: /** Two phase construction **/ - static CJavaApplicationService* CJavaApplicationService::NewL(); + static CJavaApplicationService* NewL(); - static CJavaApplicationService* CJavaApplicationService::NewLC(); + static CJavaApplicationService* NewLC(); /** Virtual destructor **/ virtual ~CJavaApplicationService(); diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/inc/MMCService.h --- a/terminalsecurity/SCP/DmEventNotifier/inc/MMCService.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/inc/MMCService.h Tue Feb 02 00:44:00 2010 +0200 @@ -51,9 +51,9 @@ public: /** Two phase construction **/ - static CMmcService* CMmcService::NewL(); + static CMmcService* NewL(); - static CMmcService* CMmcService::NewLC(); + static CMmcService* NewLC(); /** Virtual destructor **/ virtual ~CMmcService(); @@ -83,7 +83,7 @@ */ const TDesC& TaskName(); - void UpdateMmcStatus(); + void UpdateMmcStatusL(); private: /** Constructors **/ diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/inc/SwApplicationService.h --- a/terminalsecurity/SCP/DmEventNotifier/inc/SwApplicationService.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/inc/SwApplicationService.h Tue Feb 02 00:44:00 2010 +0200 @@ -45,9 +45,9 @@ public: /** Two phase construction **/ - static CSwApplicationService* CSwApplicationService::NewL(); + static CSwApplicationService* NewL(); - static CSwApplicationService* CSwApplicationService::NewLC(); + static CSwApplicationService* NewLC(); /** Virtual destructor **/ virtual ~CSwApplicationService(); diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/src/DmEventHandler.cpp --- a/terminalsecurity/SCP/DmEventNotifier/src/DmEventHandler.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/src/DmEventHandler.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -32,7 +32,7 @@ // ----------------------------------------------------------------------------- LOCAL_D void InvokeNotifiersL(RFile& aTaskFile) { - FLOG(_L("DmEventHandler InvokeNotifiersL >>")); + _DMEVNT_DEBUG(_L("DmEventHandler InvokeNotifiersL >>")); CFileStore* store; RStoreReadStream instream; @@ -40,7 +40,7 @@ store = CDirectFileStore::FromLC(aTaskFile); instream.OpenLC(*store,store->Root()); TInt count = instream.ReadInt32L(); - FLOG(_L("SwInstallhandler task count %d"),count ); + _DMEVNT_DEBUG(_L("SwInstallhandler task count %d"),count ); CScheduledTask* task = CScheduledTask::NewLC(instream); HBufC* b = const_cast(&(task->Data())); @@ -52,12 +52,12 @@ CleanupStack::PopAndDestroy( store ); - FLOG(_L("Waiting for completion...")); + _DMEVNT_DEBUG(_L("Waiting for completion...")); CDmEventScheduler* sch = CDmEventScheduler::NewLC(); sch->WaitAndCreateConditionScheduleL(taskname); CleanupStack::PopAndDestroy(sch); - FLOG(_L("DmEventHandler InvokeNotifiersL <<")); + _DMEVNT_DEBUG(_L("DmEventHandler InvokeNotifiersL <<")); } @@ -67,7 +67,7 @@ // ----------------------------------------------------------------------------- LOCAL_D TInt ExecuteL() { - FLOG(_L("DmEventHandler ExecuteL...>>")); + _DMEVNT_DEBUG(_L("DmEventHandler ExecuteL...>>")); TInt err = KErrNoMemory; RFile file; @@ -75,13 +75,13 @@ // Adopt the task file from the Task Scheduler err = file.AdoptFromCreator(TScheduledTaskFile::FsHandleIndex(), TScheduledTaskFile::FileHandleIndex()); - FLOG(_L(" err %d"),err ); + _DMEVNT_DEBUG(_L(" err %d"),err ); if (KErrNone == err) { TRAP(err, InvokeNotifiersL(file)); - FLOG(_L("Error = %d"), err); + _DMEVNT_DEBUG(_L("Error = %d"), err); } else if (KErrNotFound == err) { @@ -95,7 +95,7 @@ file.Close(); - FLOG(_L("DmEventHandler ExecuteL...<<")); + _DMEVNT_DEBUG(_L("DmEventHandler ExecuteL...<<")); return err; } @@ -106,7 +106,7 @@ LOCAL_D TInt Execute() { __UHEAP_MARK; - FLOG(_L("DmEventHandler Execute() >>")); + _DMEVNT_DEBUG(_L("DmEventHandler Execute() >>")); TInt err = KErrNoMemory; @@ -126,7 +126,7 @@ } delete scheduler; scheduler = NULL; - FLOG(_L("DmEventHandler Execute() <<")); + _DMEVNT_DEBUG(_L("DmEventHandler Execute() <<")); __UHEAP_MARKEND; return err; } diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp --- a/terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -44,14 +44,14 @@ // --------------------------------------------------------------------------- CDmEventScheduler::~CDmEventScheduler() { - FLOG(_L("CDmEventScheduler::~CDmEventScheduler >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::~CDmEventScheduler >>")); iScheduler.Close(); iServices.DeleteAll(); iServices.Reset(); - FLOG(_L("CDmEventScheduler::~CDmEventScheduler <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::~CDmEventScheduler <<")); } @@ -60,25 +60,25 @@ // --------------------------------------------------------------------------- CDmEventScheduler* CDmEventScheduler::NewL() { - FLOG(_L("CDmEventScheduler::NewL >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NewL >>")); CDmEventScheduler* self = new (ELeave) CDmEventScheduler(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(); - FLOG(_L("CDmEventScheduler::NewL <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NewL <<")); return self; } CDmEventScheduler* CDmEventScheduler::NewLC() { - FLOG(_L("CDmEventScheduler::NewLC >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NewLC >>")); CDmEventScheduler* self = CDmEventScheduler::NewL(); CleanupStack::PushL(self); - FLOG(_L("CDmEventScheduler::NewLC <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NewLC <<")); return self; } @@ -87,7 +87,7 @@ // --------------------------------------------------------------------------- void CDmEventScheduler::ConstructL() { - FLOG(_L("CDmEventScheduler::ConstructL >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::ConstructL >>")); __LEAVE_IF_ERROR(iScheduler.Connect()); @@ -101,7 +101,7 @@ iServices[EMmcService] = CMmcService::NewL(); - FLOG(_L("CDmEventScheduler::ConstructL <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::ConstructL <<")); } // --------------------------------------------------------------------------- @@ -109,7 +109,7 @@ // --------------------------------------------------------------------------- void CDmEventScheduler::CreateConditionScheduleL(CDmEventServiceBase* aService) { - FLOG(_L("CDmEventScheduler::CreateConditionSchedule >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::CreateConditionSchedule >>")); //Create new schedule TInt err(KErrNone); @@ -126,11 +126,11 @@ { TRAP(err, DeleteScheduleL()); - FLOG(_L("Deleted existing schedule, err = %d"),err); + _DMEVNT_DEBUG(_L("Deleted existing schedule, err = %d"),err); //Performing for Software Installer - FLOG(_L("Registering for Software Installer...")); + _DMEVNT_DEBUG(_L("Registering for Software Installer...")); if (iServices[ESoftwareService]->IsKeyValid()) { CSchConditionArray* aConditions; @@ -145,10 +145,10 @@ } else { - FLOG(_L("Can't read PS key, hence not registering!")); + _DMEVNT_DEBUG(_L("Can't read PS key, hence not registering!")); } //Performing for Java Installer - FLOG(_L("Registering for Java Installer...")); + _DMEVNT_DEBUG(_L("Registering for Java Installer...")); if (iServices[EJavaService]->IsKeyValid()) { CSchConditionArray* aConditions; @@ -163,11 +163,11 @@ } else { - FLOG(_L("Can't read PS key, hence not registering!")); + _DMEVNT_DEBUG(_L("Can't read PS key, hence not registering!")); } //Performing for Mmc observer - FLOG(_L("Registering for Mmc observer...")); + _DMEVNT_DEBUG(_L("Registering for Mmc observer...")); if (iServices[EMmcService]->IsKeyValid()) { CSchConditionArray* aConditions; @@ -185,17 +185,17 @@ //Set cenrep value for mmc accordingly CMmcService *ptr = (CMmcService *) iServices[EMmcService]; - ptr->UpdateMmcStatus(); + ptr->UpdateMmcStatusL(); } } else { - FLOG(_L("Can't read PS key, hence not registering!")); + _DMEVNT_DEBUG(_L("Can't read PS key, hence not registering!")); } } else { - FLOG(_L("Scheduling for only the expired service")); + _DMEVNT_DEBUG(_L("Scheduling for only the expired service")); CSchConditionArray* aConditions; aConditions = CreateConditionLC(aService); @@ -210,34 +210,33 @@ SetScheduleEnabledL(schenabled); - FLOG(_L("CDmEventScheduler::CreateConditionSchedule, error = %d <<"), err); + _DMEVNT_DEBUG(_L("CDmEventScheduler::CreateConditionSchedule, error = %d <<"), err); } // --------------------------------------------------------------------------- // CDmEventScheduler::WaitAndCreateConditionScheduleL() // --------------------------------------------------------------------------- -void CDmEventScheduler::WaitAndCreateConditionScheduleL(TName aTaskName) +void CDmEventScheduler::WaitAndCreateConditionScheduleL(TName& aTaskName) { - FLOG(_L("CDmEventScheduler::WaitAndCreateConditionScheduleL >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::WaitAndCreateConditionScheduleL >>")); SetScheduleEnabledL(EHandlerNotRegistered); CDmEventServiceBase* service = FindExpiredService(aTaskName); // CleanupStack::PushL(service); // Not necessary, as service pointer is changed in the code - if ( service ) - { - service->WaitForRequestCompleteL(); + if(NULL == service) { + _DMEVNT_DEBUG(_L("[CDmEventScheduler]-> FindExpiredService() returned NULL...")); + return; } + service->WaitForRequestCompleteL(); //Read the status from aService THandlerServiceId srvid; THandlerOperation opn; - if( service ) - { + service->GetServiceIdAndOperation(srvid,opn); - } TBool mmcservice (EFalse); if (service == iServices[EMmcService]) @@ -259,17 +258,18 @@ if ( opn != ENoOpn ) { - TRAPD(err, NotifyRegisteredServersL(srvid, opn)); - FLOG(_L("Notification error = %d"), err); + TInt err = KErrNone; + TRAP(err, NotifyRegisteredServersL(srvid, opn)); + _DMEVNT_DEBUG(_L("Notification error = %d"), err); } else { - FLOG(_L("Operation got cancelled. Skipping notification")); + _DMEVNT_DEBUG(_L("Operation got cancelled. Skipping notification")); } // CleanupStack::Pop(service); //don't destroy as object is not owned - FLOG(_L("CDmEventScheduler::WaitAndCreateConditionScheduleL <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::WaitAndCreateConditionScheduleL <<")); } // --------------------------------------------------------------------------- @@ -283,7 +283,7 @@ CArrayFixFlat* &aConditions, CDmEventServiceBase* aService) { - FLOG(_L("CDmEventScheduler::CreateConditionScheduleWithTaskL >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::CreateConditionScheduleWithTaskL >>")); TInt ret(KErrNone); @@ -310,10 +310,10 @@ else { //Creating persistent schedule failed, do something... - FLOG(_L("Creation of persistent scheduled failed, error = %d"), ret); + _DMEVNT_DEBUG(_L("Creation of persistent scheduled failed, error = %d"), ret); } - FLOG(_L("CDmEventScheduler::CreateConditionScheduleWithTaskL, ret = %d <<"), ret); + _DMEVNT_DEBUG(_L("CDmEventScheduler::CreateConditionScheduleWithTaskL, ret = %d <<"), ret); return ret; } @@ -322,7 +322,7 @@ // --------------------------------------------------------------------------- void CDmEventScheduler::DeleteScheduleL() { - FLOG(_L("CDmEventScheduler::DeleteScheduleL >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::DeleteScheduleL >>")); RScheduler sc; CArrayFixFlat* aSchRefArray = new CArrayFixFlat (KScheduleReferenceMax); @@ -332,7 +332,7 @@ CleanupStack::PushL(aSchRefArray); User::LeaveIfError( sc.GetScheduleRefsL( *aSchRefArray,aFilter) ); - FLOG(_L("Schedule items: ")); + _DMEVNT_DEBUG(_L("Schedule items: ")); for ( TInt i=0; iCount(); ++i ) { TSchedulerItemRef it = (*aSchRefArray)[i]; @@ -345,7 +345,7 @@ CleanupStack::PushL( sc_entries ); CleanupStack::PushL( sc_tasks ); - FLOG (_L("%d. schedule handle: %d name:'%S'"),i,it.iHandle, &(it.iName) ); + _DMEVNT_DEBUG (_L("%d. schedule handle: %d name:'%S'"),i,it.iHandle, &(it.iName) ); TInt err = sc.GetScheduleL ( it.iHandle , sc_state, *sc_entries, sc_time, *sc_tasks); @@ -354,19 +354,19 @@ for ( TInt j=0; jCount();++j) { TTaskInfo sc_task = (*sc_tasks)[j]; - FLOG(_L(" schedule task %d '%S'"),sc_task.iTaskId,&(sc_task.iName) ); + _DMEVNT_DEBUG(_L(" schedule task %d '%S'"),sc_task.iTaskId,&(sc_task.iName) ); err = sc.DeleteTask(sc_task.iTaskId); - FLOG(_L("Deleted task state, error = %d"), err); + _DMEVNT_DEBUG(_L("Deleted task state, error = %d"), err); } } else { - FLOG(_L("Getting schedule error = %d"), err); + _DMEVNT_DEBUG(_L("Getting schedule error = %d"), err); } err = sc.DeleteSchedule(it.iHandle ); - FLOG(_L("Deleted schedule %d, error = %d"),i+1, err); + _DMEVNT_DEBUG(_L("Deleted schedule %d, error = %d"),i+1, err); CleanupStack::PopAndDestroy( sc_tasks ); CleanupStack::PopAndDestroy( sc_entries ); @@ -374,7 +374,7 @@ } CleanupStack::PopAndDestroy( aSchRefArray ); CleanupStack::PopAndDestroy(&sc); - FLOG(_L("CDmEventScheduler::DeleteScheduleL <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::DeleteScheduleL <<")); } // --------------------------------------------------------------------------- @@ -382,7 +382,7 @@ // --------------------------------------------------------------------------- CSchConditionArray* CDmEventScheduler::CreateConditionLC(CDmEventServiceBase* aService) { - FLOG(_L("CDmEventScheduler::CreateConditionLC >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::CreateConditionLC >>")); CSchConditionArray* conditions = new (ELeave) CSchConditionArray(KConditionArraySize); CleanupStack::PushL(conditions); //To be poped/destroyed by the caller @@ -396,7 +396,7 @@ conditions->AppendL(Condition); - FLOG(_L("CDmEventScheduler::CreateConditionLC <<")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::CreateConditionLC <<")); return conditions; } @@ -405,30 +405,30 @@ // --------------------------------------------------------------------------- CDmEventServiceBase* CDmEventScheduler::FindExpiredService(TName& aTaskName) { - FLOG(_L("CDmEventScheduler::FindExpiredService >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::FindExpiredService >>")); CDmEventServiceBase* ret (NULL); if (iServices[ESoftwareService]->TaskName().Compare(aTaskName) == KErrNone) { - FLOG(_L("SW Operation detected...")) + _DMEVNT_DEBUG(_L("SW Operation detected...")) ret = iServices[ESoftwareService]; } else if (iServices[EJavaService]->TaskName().Compare(aTaskName) == KErrNone) { - FLOG(_L("Java Inst Operation detected...")) + _DMEVNT_DEBUG(_L("Java Inst Operation detected...")) ret = iServices[EJavaService]; } else if (iServices[EMmcService]->TaskName().Compare(aTaskName) == KErrNone) { - FLOG(_L("MMC Operation detected...")) + _DMEVNT_DEBUG(_L("MMC Operation detected...")) ret = iServices[EMmcService]; } else { //Should not land here... - FLOG(_L("Unknown trigger")); + _DMEVNT_DEBUG(_L("Unknown trigger")); } - FLOG(_L("CDmEventScheduler::FindExpiredService, ret = %X <<"), ret); + _DMEVNT_DEBUG(_L("CDmEventScheduler::FindExpiredService, ret = %X <<"), ret); return ret; } @@ -437,7 +437,7 @@ // --------------------------------------------------------------------------- void CDmEventScheduler::NotifyRegisteredServersL(THandlerServiceId aServiceId, THandlerOperation aOpn) { - FLOG(_L("CDmEventScheduler::NotifyRegisteredServersL, serviceid = %d, operation = %d >>"), aServiceId, aOpn); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NotifyRegisteredServersL, serviceid = %d, operation = %d >>"), aServiceId, aOpn); //Read whome to notify... CRepository* cenrep (NULL); cenrep = CRepository::NewLC( KAppDmEventNotifierUid ); @@ -451,21 +451,22 @@ if (notifyscp) { - FLOG(_L("CDmEventScheduler::NotifyRegisteredServersL: Invocation of SCPEventHandler")); - TRAPD ( err, { + TInt err = KErrNone; + _DMEVNT_DEBUG(_L("CDmEventScheduler::NotifyRegisteredServersL: Invocation of SCPEventHandler")); + TRAP( err, { CSCPEventHandler* handler = CSCPEventHandler::NewL(); handler->NotifyChangesL(aServiceId, aOpn); delete handler; handler = NULL; }); - FLOG(_L("CDmEventScheduler::NotifyRegisteredServersL: SCPEventHandler completed with err: %d"), err); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NotifyRegisteredServersL: SCPEventHandler completed with err: %d"), err); } if (notifyam) { //Notify AM server on the happened operation } - FLOG(_L("CDmEventScheduler::NotifyRegisteredServersL notifyscp = %d, notifyam = %d<<"),notifyscp,notifyam); + _DMEVNT_DEBUG(_L("CDmEventScheduler::NotifyRegisteredServersL notifyscp = %d, notifyam = %d<<"),notifyscp,notifyam); } // --------------------------------------------------------------------------- @@ -473,14 +474,14 @@ // --------------------------------------------------------------------------- TBool CDmEventScheduler::IsScheduleEnabledL() { - FLOG(_L("CDmEventScheduler::IsScheduleEnabledL >>")); + _DMEVNT_DEBUG(_L("CDmEventScheduler::IsScheduleEnabledL >>")); CRepository* cenrep (NULL); TInt error (KErrNone); TInt value (KErrNotFound); TRAP(error, cenrep = CRepository::NewL( KAppDmEventNotifierUid )); - FLOG(_L("Cenrep file read status = %d"), error); + _DMEVNT_DEBUG(_L("Cenrep file read status = %d"), error); User::LeaveIfError(error); CleanupStack::PushL(cenrep); @@ -488,7 +489,7 @@ CleanupStack::PopAndDestroy(cenrep); - FLOG(_L("CDmEventScheduler::IsScheduleEnabledL, value = %d, error = %d <<"),value, error); + _DMEVNT_DEBUG(_L("CDmEventScheduler::IsScheduleEnabledL, value = %d, error = %d <<"),value, error); return (value == EHandlerRegistered); } @@ -497,18 +498,17 @@ // --------------------------------------------------------------------------- void CDmEventScheduler::SetScheduleEnabledL(TBool aValue) { - FLOG(_L("CDmEventScheduler::SetScheduleEnabledL, aValue = %d >>"), aValue); + _DMEVNT_DEBUG(_L("CDmEventScheduler::SetScheduleEnabledL, aValue = %d >>"), aValue); CRepository* cenrep (NULL); - TInt error (KErrNone); cenrep = CRepository::NewL( KAppDmEventNotifierUid ); CleanupStack::PushL(cenrep); - error = cenrep->Set(KDmEventNotifierEnabled, aValue); + TInt error = cenrep->Set(KDmEventNotifierEnabled, aValue); CleanupStack::PopAndDestroy(cenrep); - FLOG(_L("CDmEventScheduler::SetScheduleEnabledL, error = %d <<"),error); + _DMEVNT_DEBUG(_L("CDmEventScheduler::SetScheduleEnabledL, error = %d <<"),error); } //End of file diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/src/JavaApplicationService.cpp --- a/terminalsecurity/SCP/DmEventNotifier/src/JavaApplicationService.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/src/JavaApplicationService.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -26,7 +26,7 @@ // --------------------------------------------------------------------------- CJavaApplicationService* CJavaApplicationService::NewL() { - FLOG(_L("CJavaApplicationService::NewL >>")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::NewL >>")); CJavaApplicationService* self = new (ELeave) CJavaApplicationService(KJavaPSKeyCondition); CleanupStack::PushL(self); @@ -34,7 +34,7 @@ self->ConstructL(); CleanupStack::Pop(self); - FLOG(_L("CJavaApplicationService::NewL <<")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::NewL <<")); return self; } @@ -43,12 +43,12 @@ // --------------------------------------------------------------------------- CJavaApplicationService* CJavaApplicationService::NewLC() { - FLOG(_L("CJavaApplicationService::NewLC >>")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::NewLC >>")); CJavaApplicationService* self = CJavaApplicationService::NewL(); CleanupStack::PushL(self); - FLOG(_L("CJavaApplicationService::NewLC <<")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::NewLC <<")); return self; } @@ -57,9 +57,9 @@ // --------------------------------------------------------------------------- void CJavaApplicationService::ConstructL() { - FLOG(_L("CJavaApplicationService::ConstructL >>")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::ConstructL >>")); - FLOG(_L("CJavaApplicationService::ConstructL <<")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::ConstructL <<")); } // --------------------------------------------------------------------------- @@ -67,9 +67,9 @@ // --------------------------------------------------------------------------- CJavaApplicationService::CJavaApplicationService(const TPSKeyCondition& aPSKeyCondition):CDmEventServiceBase(aPSKeyCondition, EJavaService) { - FLOG(_L("CJavaApplicationService::CJavaApplicationService >>")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::CJavaApplicationService >>")); - FLOG(_L("CJavaApplicationService::CJavaApplicationService <<")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::CJavaApplicationService <<")); } // --------------------------------------------------------------------------- @@ -85,7 +85,7 @@ // --------------------------------------------------------------------------- TBool CJavaApplicationService::IsKeyValid() { - FLOG(_L("CJavaApplicationService::IsKeyValid >>")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::IsKeyValid >>")); TBool ret (EFalse); TInt value (KErrNone); @@ -93,7 +93,7 @@ if (RProperty::Get(KJavaPSKeyCondition.iPskey.iConditionCategory, KJavaPSKeyCondition.iPskey.iConditionKey, value) == KErrNone) ret = ETrue; - FLOG(_L("CJavaApplicationService::IsKeyValid, return = %d >>"), ret); + _DMEVNT_DEBUG(_L("CJavaApplicationService::IsKeyValid, return = %d >>"), ret); return ret; } @@ -103,7 +103,7 @@ // --------------------------------------------------------------------------- void CJavaApplicationService::WaitForRequestCompleteL() { - FLOG(_L("CJavaApplicationService::WaitForRequestCompleteL >>")); + _DMEVNT_DEBUG(_L("CJavaApplicationService::WaitForRequestCompleteL >>")); TRequestStatus status (KErrNone); RProperty prop; @@ -112,7 +112,7 @@ iOperation = ENoOpn; TPSKey pskey = GetPSKeyCondition().iPskey; do { - FLOG(_L("Waiting for IDLE state...")) + _DMEVNT_DEBUG(_L("Waiting for IDLE state...")) __LEAVE_IF_ERROR( prop.Attach(pskey.iConditionCategory, pskey.iConditionKey)); prop.Subscribe(status); @@ -121,7 +121,7 @@ __LEAVE_IF_ERROR( prop.Get(pskey.iConditionCategory, pskey.iConditionKey, value)); }while (IsSwInIdle(value)); - FLOG(_L("CSwApplicationService::WaitForRequestCompleteL >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::WaitForRequestCompleteL >>")); } // --------------------------------------------------------------------------- @@ -129,14 +129,14 @@ // --------------------------------------------------------------------------- TBool CJavaApplicationService::IsSwInIdle(TInt aValue) { - FLOG(_L("CJavaApplicationService::IsSwInIdle, value = %d >> "), aValue); + _DMEVNT_DEBUG(_L("CJavaApplicationService::IsSwInIdle, value = %d >> "), aValue); TBool ret (EFalse); TInt operation(aValue & KJavaOperationMask); TInt operationStatus(aValue & KJavaStatusMask); - FLOG(_L("operation %d, status %d"), operation, operationStatus); + _DMEVNT_DEBUG(_L("operation %d, status %d"), operation, operationStatus); if (EJavaStatusSuccess == operationStatus) { @@ -144,19 +144,19 @@ { case EJavaInstall: { - FLOG(_L("Uninstallation in progress")); + _DMEVNT_DEBUG(_L("Uninstallation in progress")); iOperation = EOpnInstall; } break; case EJavaUninstall: { - FLOG(_L("Restore in progress")); + _DMEVNT_DEBUG(_L("Restore in progress")); iOperation = EOpnUninstall; } break; default: { - FLOG(_L("Unknown operation")); + _DMEVNT_DEBUG(_L("Unknown operation")); iOperation = EOpnUnknown; } } @@ -164,7 +164,7 @@ ret = (operation != Swi::ESwisNone)? ETrue:EFalse; - FLOG(_L("CJavaApplicationService::IsSwInIdle, ret = %d << "),ret); + _DMEVNT_DEBUG(_L("CJavaApplicationService::IsSwInIdle, ret = %d << "),ret); return ret; } diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/src/MMCService.cpp --- a/terminalsecurity/SCP/DmEventNotifier/src/MMCService.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/src/MMCService.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -28,7 +28,7 @@ // --------------------------------------------------------------------------- CMmcService* CMmcService::NewL() { - FLOG(_L("CMmcService::NewL >>")); + _DMEVNT_DEBUG(_L("CMmcService::NewL >>")); TInt value (KErrNotFound); @@ -36,12 +36,12 @@ CMmcService* self (NULL); if(value == 0) { - FLOG(_L("MMC is removed, hence setting for insertion...")); + _DMEVNT_DEBUG(_L("MMC is removed, hence setting for insertion...")); self = new (ELeave) CMmcService(KMMCPSKeyConditionInsert); } else //(value == 1) { - FLOG(_L("MMC is inserted, hence setting for removal...")) + _DMEVNT_DEBUG(_L("MMC is inserted, hence setting for removal...")) self = new (ELeave) CMmcService(KMMCPSKeyConditionRemove); } @@ -50,7 +50,7 @@ self->ConstructL(); self->iLookingFor = value; CleanupStack::Pop(self); - FLOG(_L("CMmcService::NewL <<")); + _DMEVNT_DEBUG(_L("CMmcService::NewL <<")); return self; } @@ -59,12 +59,12 @@ // --------------------------------------------------------------------------- CMmcService* CMmcService::NewLC() { - FLOG(_L("CMmcService::NewLC >>")); + _DMEVNT_DEBUG(_L("CMmcService::NewLC >>")); CMmcService* self = CMmcService::NewL(); CleanupStack::PushL(self); - FLOG(_L("CMmcService::NewLC <<")); + _DMEVNT_DEBUG(_L("CMmcService::NewLC <<")); return self; } @@ -73,9 +73,9 @@ // --------------------------------------------------------------------------- void CMmcService::ConstructL() { - FLOG(_L("CMmcService::ConstructL >>")); + _DMEVNT_DEBUG(_L("CMmcService::ConstructL >>")); - FLOG(_L("CMmcService::ConstructL <<")); + _DMEVNT_DEBUG(_L("CMmcService::ConstructL <<")); } // --------------------------------------------------------------------------- @@ -83,9 +83,9 @@ // --------------------------------------------------------------------------- CMmcService::CMmcService(const TPSKeyCondition& aPSKeyCondition):CDmEventServiceBase(aPSKeyCondition, EMmcService) { - FLOG(_L("CMmcService::CMmcService >>")); + _DMEVNT_DEBUG(_L("CMmcService::CMmcService >>")); - FLOG(_L("CMmcService::CMmcService <<")); + _DMEVNT_DEBUG(_L("CMmcService::CMmcService <<")); } // --------------------------------------------------------------------------- @@ -101,7 +101,7 @@ // --------------------------------------------------------------------------- TBool CMmcService::IsKeyValid() { - FLOG(_L("CMmcService::IsKeyValid >>")); + _DMEVNT_DEBUG(_L("CMmcService::IsKeyValid >>")); TBool ret (EFalse); TInt value (KErrNone); @@ -109,7 +109,7 @@ if (RProperty::Get(KMMCPSKey.iConditionCategory, KMMCPSKey.iConditionKey, value) == KErrNone) ret = ETrue; - FLOG(_L("CMmcService::IsKeyValid, return = %d >>"), ret); + _DMEVNT_DEBUG(_L("CMmcService::IsKeyValid, return = %d >>"), ret); return ret; } @@ -119,12 +119,12 @@ // --------------------------------------------------------------------------- void CMmcService::WaitForRequestCompleteL() { - FLOG(_L("CMmcService::WaitForRequestCompleteL >>")); + _DMEVNT_DEBUG(_L("CMmcService::WaitForRequestCompleteL >>")); TInt value (KErrNone); iOperation = ENoOpn; TInt err = RProperty::Get(KMMCPSKey.iConditionCategory, KMMCPSKey.iConditionKey, value); - FLOG(_L("err = %d"), err); + _DMEVNT_DEBUG(_L("err = %d"), err); switch (value) { @@ -144,7 +144,7 @@ } break; } - FLOG(_L("CMmcService::WaitForRequestCompleteL <<")); + _DMEVNT_DEBUG(_L("CMmcService::WaitForRequestCompleteL <<")); } // --------------------------------------------------------------------------- @@ -155,9 +155,9 @@ return KMmcTaskName(); } -void CMmcService::UpdateMmcStatus() +void CMmcService::UpdateMmcStatusL() { - FLOG(_L("Looking for %d"), iLookingFor); + _DMEVNT_DEBUG(_L("Looking for %d"), iLookingFor); if (iLookingFor != KErrNotFound) { @@ -167,6 +167,6 @@ } else { - FLOG(_L("Can't set value %d to cenrep"), iLookingFor); + _DMEVNT_DEBUG(_L("Can't set value %d to cenrep"), iLookingFor); } } diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/DmEventNotifier/src/SwApplicationService.cpp --- a/terminalsecurity/SCP/DmEventNotifier/src/SwApplicationService.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/DmEventNotifier/src/SwApplicationService.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -25,7 +25,7 @@ // --------------------------------------------------------------------------- CSwApplicationService* CSwApplicationService::NewL() { - FLOG(_L("CSwApplicationService::NewL >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::NewL >>")); CSwApplicationService* self = new (ELeave) CSwApplicationService(KSwPSKeyCondition); CleanupStack::PushL(self); @@ -33,7 +33,7 @@ self->ConstructL(); CleanupStack::Pop(self); - FLOG(_L("CSwApplicationService::NewL <<")); + _DMEVNT_DEBUG(_L("CSwApplicationService::NewL <<")); return self; } @@ -42,12 +42,12 @@ // --------------------------------------------------------------------------- CSwApplicationService* CSwApplicationService::NewLC() { - FLOG(_L("CSwApplicationService::NewLC >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::NewLC >>")); CSwApplicationService* self = CSwApplicationService::NewL(); CleanupStack::PushL(self); - FLOG(_L("CSwApplicationService::NewLC <<")); + _DMEVNT_DEBUG(_L("CSwApplicationService::NewLC <<")); return self; } @@ -56,9 +56,9 @@ // --------------------------------------------------------------------------- void CSwApplicationService::ConstructL() { - FLOG(_L("CSwApplicationService::ConstructL >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::ConstructL >>")); - FLOG(_L("CSwApplicationService::ConstructL <<")); + _DMEVNT_DEBUG(_L("CSwApplicationService::ConstructL <<")); } // --------------------------------------------------------------------------- @@ -66,9 +66,9 @@ // --------------------------------------------------------------------------- CSwApplicationService::CSwApplicationService(const TPSKeyCondition& aPSKeyCondition):CDmEventServiceBase(aPSKeyCondition, ESoftwareService) { - FLOG(_L("CSwApplicationService::CSwApplicationService >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::CSwApplicationService >>")); - FLOG(_L("CSwApplicationService::CSwApplicationService <<")); + _DMEVNT_DEBUG(_L("CSwApplicationService::CSwApplicationService <<")); } // --------------------------------------------------------------------------- @@ -84,7 +84,7 @@ // --------------------------------------------------------------------------- TBool CSwApplicationService::IsKeyValid() { - FLOG(_L("CSwApplicationService::IsKeyValid >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::IsKeyValid >>")); TBool ret (EFalse); TInt value (KErrNone); @@ -92,7 +92,7 @@ if (RProperty::Get(KSwPSKeyCondition.iPskey.iConditionCategory, KSwPSKeyCondition.iPskey.iConditionKey, value) == KErrNone) ret = ETrue; - FLOG(_L("CSwApplicationService::IsKeyValid, return = %d >>"), ret); + _DMEVNT_DEBUG(_L("CSwApplicationService::IsKeyValid, return = %d >>"), ret); return ret; } @@ -101,7 +101,7 @@ // --------------------------------------------------------------------------- void CSwApplicationService::WaitForRequestCompleteL() { - FLOG(_L("CSwApplicationService::WaitForRequestCompleteL >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::WaitForRequestCompleteL >>")); TRequestStatus status (KErrNone); RProperty prop; @@ -110,7 +110,7 @@ iOperation = ENoOpn; TPSKey pskey = GetPSKeyCondition().iPskey; do { - FLOG(_L("Waiting for IDLE state...")) + _DMEVNT_DEBUG(_L("Waiting for IDLE state...")) __LEAVE_IF_ERROR( prop.Attach(pskey.iConditionCategory, pskey.iConditionKey)); prop.Subscribe(status); @@ -119,7 +119,7 @@ __LEAVE_IF_ERROR( prop.Get(pskey.iConditionCategory, pskey.iConditionKey, value)); }while (IsSwInIdle(value)); - FLOG(_L("CSwApplicationService::WaitForRequestCompleteL >>")); + _DMEVNT_DEBUG(_L("CSwApplicationService::WaitForRequestCompleteL >>")); } // --------------------------------------------------------------------------- @@ -127,13 +127,13 @@ // --------------------------------------------------------------------------- TBool CSwApplicationService::IsSwInIdle(TInt aValue) { - FLOG(_L("CSwApplicationService::IsSwInIdle, value = %d >> "), aValue); + _DMEVNT_DEBUG(_L("CSwApplicationService::IsSwInIdle, value = %d >> "), aValue); TInt operation(aValue & Swi::KSwisOperationMask); TInt operationStatus(aValue & Swi::KSwisOperationStatusMask); TBool ret (EFalse); - FLOG(_L("operation %d, status %d"), operation, operationStatus); + _DMEVNT_DEBUG(_L("operation %d, status %d"), operation, operationStatus); if (Swi::ESwisStatusSuccess == operationStatus) { @@ -141,31 +141,31 @@ { case Swi::ESwisInstall: { - FLOG(_L("Installation in progress")); + _DMEVNT_DEBUG(_L("Installation in progress")); iOperation = EOpnInstall; } break; case Swi::ESwisUninstall: { - FLOG(_L("Uninstallation in progress")); + _DMEVNT_DEBUG(_L("Uninstallation in progress")); iOperation = EOpnUninstall; } break; case Swi::ESwisRestore: { - FLOG(_L("Restore in progress")); + _DMEVNT_DEBUG(_L("Restore in progress")); iOperation = EOpnRestore; } break; default: { - FLOG(_L("Unknown operation")); + _DMEVNT_DEBUG(_L("Unknown operation")); iOperation = EOpnUnknown; } } } ret = (operation != Swi::ESwisNone)? ETrue:EFalse; - FLOG(_L("CSwApplicationService::IsSwInIdle, ret = %d << "),ret); + _DMEVNT_DEBUG(_L("CSwApplicationService::IsSwInIdle, ret = %d << "),ret); return ret; } diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/SCPClient/src/SCPClient.cpp --- a/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -1252,8 +1252,8 @@ case ESecUiEmergencyCall: lRet = ESecUiEmergencyCall; break; - default: - break; + /*default: + break;*/ } } } diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp --- a/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -74,9 +74,11 @@ iPreviousCharacterWasInvalid( EFalse ), iPrioritySet( EFalse ), iPriorityDropped( EFalse ), - iKeyUsed ( NULL ), - isCallSoftkeyAdded(EFalse) + iKeyUsed ( NULL ) { + def_mode = 0; + iAppKey = 0; + iMode = KSCPModeNormal; } // diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp --- a/terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -177,7 +177,9 @@ __LEAVE_IF_ERROR(lDBView.Prepare(iParameterDB, TDbQuery(*lSelectQry))); __LEAVE_IF_ERROR(lDBView.EvaluateAll()); - lDBView.FirstL(); + if(EFalse == lDBView.FirstL()) { + return KErrNotFound; + } TInt lRowCount = lDBView.CountL(); @@ -212,7 +214,9 @@ __LEAVE_IF_ERROR(lDBView.Prepare(iParameterDB, TDbQuery(*lSelectQry))); __LEAVE_IF_ERROR(lDBView.EvaluateAll()); - lDBView.FirstL(); + if(EFalse == lDBView.FirstL()) { + return KErrNotFound; + } TInt size(0); TInt lRowCount = lDBView.CountL(); diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/SCPEventHandler/src/SCPEventHandler.cpp --- a/terminalsecurity/SCP/SCPEventHandler/src/SCPEventHandler.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/SCPEventHandler/src/SCPEventHandler.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -87,11 +87,11 @@ EXPORT_C void CSCPEventHandler::NotifyChangesL(THandlerServiceId aEvent, THandlerOperation aOperation) { - FLOG(_L("[CSCPEventHandler]-> started NotifyChangesL() aOperation=%d"), aOperation); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> started NotifyChangesL() aOperation=%d"), aOperation); if( (EOpnUninstall == aOperation) || (EOpnRemoved == aOperation)) { - FLOG(_L("[CSCPEventHandler]-> EUninstallation == aOperation || EOpnRemoved == aOperation")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> EUninstallation == aOperation || EOpnRemoved == aOperation")); RArray uids; CleanupClosePushL(uids); @@ -99,11 +99,11 @@ CSCPParamDBController* dbObj = CSCPParamDBController::NewLC(); //calling...ListApplicationsL - FLOG(_L("[CSCPEventHandler]-> ListApplicationsL started")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> ListApplicationsL started")); dbObj->ListApplicationsL(uids); CleanupStack :: PopAndDestroy(); // dbObj - FLOG(_L("[CSCPEventHandler]-> ListApplicationsL ended")); - FLOG(_L("[CSCPEventHandler]-> uids = %d"), uids.Count()); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> ListApplicationsL ended")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> uids = %d"), uids.Count()); /* RArray sisUids; CleanupClosePushL( sisUids );*/ @@ -119,18 +119,18 @@ RArray resultUids; CleanupClosePushL(resultUids); - FLOG(_L("[CSCPEventHandler]-> Entering loop for each application, to check with AI")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> Entering loop for each application, to check with AI")); for (int i=0; i < uids.Count(); i++) { - FLOG(_L("[CSCPEventHandler]-> INFO: Checking case for UID %d"), uids[i].iUid); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> INFO: Checking case for UID %d"), uids[i].iUid); switch(uids[i].iUid) { case KNSmlDMHostServer1ID: case KNSmlDMHostServer2ID: case KNSmlDMHostServer3ID: case KNSmlDMHostServer4ID: - FLOG(_L("[CSCPEventHandler]-> INFO: UID is marked as an exception, cleanup request bypassed...")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> INFO: UID is marked as an exception, cleanup request bypassed...")); break; default: { Swi::RSisRegistryEntry sisEntry; @@ -138,14 +138,14 @@ TInt lErr = sisEntry.Open(sisses, uids[i]); CleanupClosePushL(sisEntry); - FLOG(_L("[CSCPEventHandler]-> INFO: lErr = %d"), lErr); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> INFO: lErr = %d"), lErr); //if(EFalse == isInstalledSis(uids[i], sisUids)) // If the application does not exist if( lErr != KErrNone || EFalse == sisEntry.IsPresentL()) { - FLOG(_L("[CSCPEventHandler]-> INFO: UID %d was identified as uninstalled,\ + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> INFO: UID %d was identified as uninstalled,\ performing cleanup on the same"), uids[i].iUid); // Does not exist in sis-registry, need to check in java registry //if(EFalse == isInstalledJava(uids[i], javaUids)) @@ -160,8 +160,8 @@ //CleanupStack::PopAndDestroy( &sisUids ); // sisUids //CleanupStack::PopAndDestroy( &javaUids ); // javaUids - FLOG(_L("[CSCPEventHandler]->NotifyChangesL(): Loop ended")); - FLOG(_L("[CSCPEventHandler]-> resultUids = %d"), resultUids.Count()); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]->NotifyChangesL(): Loop ended")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> resultUids = %d"), resultUids.Count()); if(resultUids.Count()) { @@ -170,7 +170,7 @@ CleanupStack :: PopAndDestroy(3); // resultUids, sisses, uids }// if (EUninstallation == aOperation) - FLOG(_L("[CSCPEventHandler]-> end of NotifyChangesL()")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> end of NotifyChangesL()")); } /* @@ -206,15 +206,15 @@ inline void CSCPEventHandler::NotifyCleanupL(RArray& aUids) { - FLOG(_L("[CSCPEventHandler:NotifyCleanupL]-> RSCPClient creation & connecting...")) + _DMEVNT_DEBUG(_L("[CSCPEventHandler:NotifyCleanupL]-> RSCPClient creation & connecting...")); RSCPClient lClient; CleanupClosePushL (lClient); User :: LeaveIfError(lClient.Connect()); - FLOG(_L("[CSCPEventHandler]-> Initializing cleanup...")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> Initializing cleanup...")); //TRAPD(lErr, lClient.PerformCleanupL(ESCPApplicationUninstalled, aUids)); User :: LeaveIfError(lClient.PerformCleanupL(aUids)); CleanupStack :: PopAndDestroy(); // lClient - FLOG(_L("[CSCPEventHandler]-> cleanup complete...")); - FLOG(_L("[CSCPEventHandler:NotifyCleanupL]-> RSCPClient operation Completed...")) + _DMEVNT_DEBUG(_L("[CSCPEventHandler]-> cleanup complete...")); + _DMEVNT_DEBUG(_L("[CSCPEventHandler:NotifyCleanupL]-> RSCPClient operation Completed...")); } diff -r 958eca8527dd -r 3f7d9dbe57c8 terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h --- a/terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h Tue Jan 26 12:43:57 2010 +0200 +++ b/terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h Tue Feb 02 00:44:00 2010 +0200 @@ -159,12 +159,12 @@ /** * Fetches the resource data from the file. */ - TInt CSCPTimestampPlugin::GetResource(); + TInt GetResource(); /** * Loads a specified resource buffer. */ - HBufC16* CSCPTimestampPlugin::LoadResourceL( TInt aResId ); + HBufC16* LoadResourceL( TInt aResId ); void FormatResourceString(HBufC16 &aResStr); private: // Data