--- a/package_definition.xml	Fri Sep 17 19:59:15 2010 +0530
+++ b/package_definition.xml	Fri Sep 24 20:27:11 2010 +0530
@@ -32,10 +32,6 @@
     <meta rel="Api" href="remotemgmt_plat/sync_alert_handler_api/sync_alert_handler_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/sync_alert_handler_api/group"/>
    </component>
-   <component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_api/syncml_notifier_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/syncml_notifier_api/group"/>
-   </component>
    <component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
     <meta rel="Api" href="remotemgmt_plat/syncml_client_api/syncml_client_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/syncml_client_api/group"/>
@@ -100,26 +96,10 @@
     <meta rel="Api" href="remotemgmt_plat/pnpms_utils_api/pnpms_utils_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/pnpms_utils_api/group"/>
    </component>
-   <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/adaptive_history_list_api/group"/>
-   </component>
-   <component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_session_api/adaptive_history_list_session_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/adaptive_history_list_session_api/group"/>
-   </component>
    <component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
     <meta rel="Api" href="remotemgmt_plat/fota_engine_api/fota_engine_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/fota_engine_api/group"/>
    </component>
-   <component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/update_package_storage_plugin_api/update_package_storage_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/update_package_storage_plugin_api/group"/>
-   </component>
-   <component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_roaming_api/syncml_notifier_roaming_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-   </component>
    <component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
     <unit bldFile="remotemgmt_plat/dcmo_adapter_api/group"/>
    </component>
@@ -130,6 +110,14 @@
     <meta rel="Api" href="remotemgmt_plat/ds_capability_mgmt_plugin_api/ds_capability_mgmt_plugin_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
    </component>
+   <component id="syncml_ds_customization_api" name="SyncML DS Customization API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="remotemgmt_plat/syncml_ds_customization_api/syncml_ds_customization_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_ds_customization_api/group"/>
+   </component>
+   <component id="syncml_ds_error_reporting_api" name="SyncML DS Error Reporting API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="remotemgmt_plat/syncml_ds_error_reporting_api/syncml_ds_error_reporting_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_ds_error_reporting_api/group"/>
+   </component>
    <component id="devicemgmt_dialogs_api" name="Device Management Dialogs API" class="api" filter="s60" introduced="^4">
     <unit bldFile="remotemgmt_plat/devicemgmt_dialogs_api/group"/>
    </component>

--- a/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Fri Sep 17 19:59:15 2010 +0530
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Fri Sep 24 20:27:11 2010 +0530
@@ -100,6 +100,9 @@
 //const TUint32 KSCPServerSIDGeneralSettings( 0x100058EC ); // General Settings
 const TUint32 KSCPServerSIDGeneralSettings( 0X20025FD9 ); // General Settings
 
+const TUint32 KSCPSecuiDialogNotifierSrv( 0x10000938 ); // SecUI Notified Server
+const TUint32 KSecUiTest( 0xEE89E3CF ); // SecUI Test App
+
 //const TUint32 KSCPServerSIDSecurityObserver( 0x10000938 ); // Security Observer
 const TUint32 KAknNfySrvUid( 0x10281EF2 ); // Security Notifier
 const TUint32 KSCPServerSIDAutolock( 0x100059B5 ); // Autolock

--- a/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Fri Sep 17 19:59:15 2010 +0530
+++ b/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Fri Sep 24 20:27:11 2010 +0530
@@ -579,7 +579,9 @@
     // Check the access for this parameter
     if((aMessage.SecureId() != KSCPServerSIDTerminalControl) &&
        (aMessage.SecureId() != KSCPServerSIDGeneralSettings) &&
-       (aMessage.SecureId() != KDevEncUiUid)) {
+       (aMessage.SecureId() != KDevEncUiUid) && 
+       (aMessage.SecureId() != KSCPSecuiDialogNotifierSrv) &&
+       (aMessage.SecureId() != KSecUiTest )) {
        
         Dprint((_L("CSCPSession::HandleSetParamMessageL(): ERROR: Permission denied")));
         User :: Leave( KErrPermissionDenied);
@@ -790,20 +792,19 @@
     Dprint( (_L("--> CSCPSession::HandleGetParamMessageL()") ));
     
 #ifdef SCP_ENFORCE_SECURITY
-
     // Check the access for this parameter
-    switch ( (TSCPParameterID)aMessage.Int0() )
-        {
+    switch ( (TSCPParameterID)aMessage.Int0() ) {
         default:        
             // For the current parameters, we allow Gs and Terminal Control Server
-            if (    ( aMessage.SecureId() != KSCPServerSIDTerminalControl ) &&
-                    ( aMessage.SecureId() != KSCPServerSIDGeneralSettings ) &&
-                 ( aMessage.SecureId() != KDevEncUiUid ) )
-                {
-                Dprint( (_L("CSCPSession::HandleSetParamMessageL(): ERROR:\
-                    Permission denied") ));
-                User::Leave( KErrPermissionDenied );
-                }
+            if(( aMessage.SecureId() != KSCPServerSIDTerminalControl ) &&
+               ( aMessage.SecureId() != KSCPServerSIDGeneralSettings ) &&
+               ( aMessage.SecureId() != KDevEncUiUid ) &&
+               ( aMessage.SecureId() != KSCPSecuiDialogNotifierSrv ) &&
+               ( aMessage.SecureId() != KSecUiTest ) ) {
+                    Dprint( (_L("CSCPSession::HandleSetParamMessageL(): ERROR:\
+                        Permission denied") ));
+                    User :: Leave( KErrPermissionDenied );
+            }
         break;        
         }
 #endif // SCP_ENFORCE_SECURITY
@@ -884,6 +885,8 @@
         case KSCPServerSIDTerminalControl:
         case KSCPServerSIDTelephone:
         case KSCPServerSIDLog:
+        case KSCPSecuiDialogNotifierSrv:
+        case KSecUiTest:
             break;
         default: {
             Dprint( (_L("[CSCPSession]-> ERROR: Permission denied") ));