--- a/sf_config/config/inc/PublicStaticFeatures.hrh	Fri Apr 02 11:47:01 2010 +0100
+++ b/sf_config/config/inc/PublicStaticFeatures.hrh	Tue Apr 13 17:59:35 2010 +0100
@@ -40,6 +40,14 @@
 KFeatureIdFfAiWlansnifferWidget,
 #endif
 
+#ifdef FF_ALTERNATIVE_CALL_WAITING_TONE
+KFeatureIdFfAlternativeCallWaitingTone,
+#endif
+
+#ifdef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT
+KFeatureIdArabicHandwritingRecognitionInput,
+#endif
+
 #ifdef FF_ASYNCH_FILE_SAVE_QUEUE
 KFeatureIdAsynchFileSaveQueue,
 #endif
@@ -48,6 +56,10 @@
 KFeatureIdFfAudt,
 #endif
 
+#ifdef FF_AUTOMOTIVESTACK
+KFeatureIdFfAutomotivestack,
+#endif
+
 #ifdef FF_AUTO_REDIAL_FOR_VIDEO_CALL
 KFeatureIdAutoRedialForVideoCall,
 #endif
@@ -72,6 +84,14 @@
 KFeatureIdBrowserProgressiveDownload,
 #endif
 
+#ifdef FF_CALENDAR_DAY_VIEW
+KFeatureIdFfCalDayView,
+#endif
+
+#ifdef FF_CALENDAR_SCROLLABLE_PREVIEW
+KFeatureIdFfCalScrollablePreview,
+#endif
+
 #ifdef FF_CAL_MEETING_REQUEST_UI
 KFeatureIdFfCalMeetingRequestUi,
 #endif
@@ -164,6 +184,10 @@
 KFeatureIdFfEmailFramework,
 #endif
 
+#ifdef FF_EMAIL_FULLSCREENVIEWER
+KFeatureIdFfEmailFullscreenviewer,
+#endif
+
 #ifdef FF_EMAIL_IPS_SERVICES
 KFeatureIdFfEmailIpsServices,
 #endif
@@ -172,6 +196,10 @@
 KFeatureIdEmailMceIntegration,
 #endif
 
+#ifdef FF_EMAIL_PREDICTIVESEARCH
+KFeatureIdFfEmailPredictivesearch,
+#endif
+
 #ifdef FF_EMAIL_PROTOCOL_PLUGINS
 KFeatureIdFfEmailProtocolPlugins,
 #endif
@@ -180,8 +208,12 @@
 KFeatureIdFfEmailUi,
 #endif
 
+#ifdef FF_EMAIL_UI_SPLITSCREEN
+KFeatureIdFfEmailUiSplitscreen,
+#endif
+
 #ifdef FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
-KFeatureIdCertificationTesting,
+KFeatureIdEnableIsiCommunicationInUsbChargingMode,
 #endif
 
 #ifdef FF_ENHANCED_CALENDAR_EVENT_UI
@@ -200,6 +232,10 @@
 KFeatureIdFfFmtxRdsText,
 #endif
 
+#ifdef FF_FOTA_CHECK_LIMITATION
+KFeatureIdFfFotaCheckLimitation,
+#endif
+
 #ifdef FF_FULLSCR_HWR_INPUT
 KFeatureIdFullscrHwrInput,
 #endif
@@ -240,6 +276,10 @@
 KFeatureIdFfIaupdatePhase2,
 #endif
 
+#ifdef FF_IMAGE_EDITOR
+KFeatureIdFfImageEditor,
+#endif
+
 #ifdef FF_INPUTS_PER_ORIENTATION
 KFeatureIdFfInputsPerOrientation,
 #endif
@@ -248,6 +288,10 @@
 KFeatureIdFfIntelligentTextInput,
 #endif
 
+#ifdef FF_IPSEC_UMA_SUPPORT_ENABLE
+KFeatureIdFfIpsecUmaSupportEnable,
+#endif
+
 #ifdef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
 KFeatureIdFfItiVirtualTouchFirstGenerationSupport,
 #endif
@@ -332,6 +376,14 @@
 KFeatureIdFfOfnFeature,
 #endif
 
+#ifdef FF_OMADRM1_FULL_SUPPORT
+KFeatureIdFfOmadrm1FullSupport,
+#endif
+
+#ifdef FF_OMADRM2_SUPPORT
+KFeatureIdFfOmadrm2Support,
+#endif
+
 #ifdef FF_OMA_SCOMO_ADAPTER
 KFeatureIdFfOmaScomoAdapter,
 #endif
@@ -340,6 +392,10 @@
 KFeatureIdFfOssLegalNotice,
 #endif
 
+#ifdef FF_PLAYREADY_SUPPORT
+KFeatureIdFfPlayreadySupport,
+#endif
+
 #ifdef FF_PNPMS_PROV_FILTER
 KFeatureIdFfPnpmsProvFilter,
 #endif
@@ -380,6 +436,18 @@
 KFeatureIdSelectableEmail,
 #endif
 
+#ifdef FF_SIDESLIDER_SUPPORT
+KFeatureIdFfSidesliderSupport,
+#endif
+
+#ifdef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING
+KFeatureIdFfSimConsecutive6f00ErrorsHandling,
+#endif
+
+#ifdef FF_SIP_APN_SWITCHING
+KFeatureIdFfSipApnSwitching,
+#endif
+
 #ifdef FF_SIP_CUSTOM_PDP_HANDLING
 KFeatureIdFfSipCustomPdpHandling,
 #endif
@@ -428,10 +496,34 @@
 KFeatureIdFfTcpMyprofile,
 #endif
 
+#ifdef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard
+KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard,
+#endif
+
+#ifdef FF_TD_CMCCATCommandsSupport
+KFeatureIdFfTdCmccatcommandssupport,
+#endif
+
+#ifdef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer
+KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver,
+#endif
+
+#ifdef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI 
+KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui ,
+#endif
+
 #ifdef FF_TD_SCDMA
 KFeatureIdFfTdScdma,
 #endif
 
+#ifdef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY
+KFeatureIdFfTdScdmaForbiddenoperatoricondisplay,
+#endif
+
+#ifdef FF_TD_SCDMA_VIDEOCALL_KEY
+KFeatureIdFfTdScdmaVideocallKey,
+#endif
+
 #ifdef FF_TOUCHSCREENCALIB_IN_STARTUP
 KFeatureIdTouchscreencalibInStartup,
 #endif
@@ -468,6 +560,10 @@
 KFeatureIdFfVideoAudioBranding,
 #endif
 
+#ifdef FF_VIDEO_EDITOR
+KFeatureIdFfVideoEditor,
+#endif
+
 #ifdef FF_VIRTUAL_FULLSCR_QWERTY_INPUT
 KFeatureIdVirtualFullscrQwertyInput,
 #endif
@@ -492,6 +588,10 @@
 KFeatureIdWebvideoPh2,
 #endif
 
+#ifdef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT
+KFeatureIdFfWlanAuthenticationOnlySupport,
+#endif
+
 #ifdef FF_WLAN_EXTENSIONS
 KFeatureIdFfWlanExtensions,
 #endif
@@ -500,6 +600,10 @@
 KFeatureIdFfWlanWapi,
 #endif
 
+#ifdef FF_WMDRM_DLA_SUPPORT
+KFeatureIdFfWmdrmDlaSupport,
+#endif
+
 #ifdef SYMBIAN_INCLUDE_LOCATION_NPE_DSM
 KFeatureIdSymbianIncludeLocationNpeDsm,
 #endif

--- a/sf_config/config/inc/bldpublic.hrh	Fri Apr 02 11:47:01 2010 +0100
+++ b/sf_config/config/inc/bldpublic.hrh	Tue Apr 13 17:59:35 2010 +0100
@@ -66,6 +66,17 @@
 */
 #undef FF_AI_WLANSNIFFER_WIDGET                           
 
+/** #FF_ALTERNATIVE_CALL_WAITING_TONE 
+When this flag is enabled an alternative call waiting tone will be used
+*/
+#undef FF_ALTERNATIVE_CALL_WAITING_TONE                   
+
+/** #FF_ARABIC_HANDWRITING_RECOGNITION_INPUT 
+This flag is used to enable arabic finger handwriting input in capacitive touch
+screen phone.
+*/
+#undef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT            
+
 /** #FF_ASYNCH_FILE_SAVE_QUEUE 
 Camcorder requires support from the Asynchronous File Save Queue.
 */
@@ -89,6 +100,11 @@
 */
 #undef FF_AUDT                                            
 
+/** #FF_AUTOMOTIVESTACK 
+S60_PUBLIC Feature Flag for In-Car Optimized device EPIC
+*/
+#undef FF_AUTOMOTIVESTACK                                 
+
 /** #FF_AUTO_REDIAL_FOR_VIDEO_CALL 
 This flag indicates redial sequence, when video call is not succeeded for
 certain reasons.
@@ -139,6 +155,23 @@
 */
 #define FF_BROWSER_PROGRESSIVE_DOWNLOAD                    
 
+/** #FF_CALENDAR_DAY_VIEW 
+This flag is needed for run time configuration of Business calendar day view.
+The day view will be loaded as a plug-in based on this flag being enabled. Day
+view will be integrated along with other native views(month, week, agenda &
+Todo).
+*/
+#undef FF_CALENDAR_DAY_VIEW                               
+
+/** #FF_CALENDAR_SCROLLABLE_PREVIEW 
+This flag is needed for run time configuration of scrollable preview pane in
+calendar. The scrollable preview pane will be loaded as a plug-in with calendar
+month view and week view based on this flag being enabled. Layouts with
+scrollable preview pane will be loaded on run time based on this flag being
+enabled for month / week view
+*/
+#undef FF_CALENDAR_SCROLLABLE_PREVIEW                     
+
 /** #FF_CAL_MEETING_REQUEST_UI 
 With this flag it is selected if Meeting Request UI included with flag
 FF_MEETING_REQUEST_UI is available on Calendar side or not. If flag is not
@@ -307,6 +340,11 @@
 */
 #define FF_CONTACTS_SOCIAL                                 
 
+/** #FF_CONTACT_WIDGET 
+	Defines if Friends widget exists or not
+*/
+#undef FF_CONTACT_WIDGET                                  
+
 /** #FF_CONTEXT_FRAMEWORK_V2 
 This flag enables Context Framework version 2.
 */
@@ -395,6 +433,11 @@
 */
 #define FF_EMAIL_FRAMEWORK                                 
 
+/** #FF_EMAIL_FULLSCREENVIEWER 
+This flag enables full screen mode in email viewer
+*/
+#undef FF_EMAIL_FULLSCREENVIEWER                          
+
 /** #FF_EMAIL_IPS_SERVICES 
 Defines whether the product includes IMAP4, POP3 and SMTP protocol support.
 */
@@ -410,6 +453,11 @@
 */
 #define FF_EMAIL_MCE_INTEGRATION                           
 
+/** #FF_EMAIL_PREDICTIVESEARCH 
+This flag enables predictive address search in email editor
+*/
+#undef FF_EMAIL_PREDICTIVESEARCH                          
+
 /** #FF_EMAIL_PROTOCOL_PLUGINS 
 When defined, default email protocol plugins are enabled.
 */
@@ -420,6 +468,12 @@
 */
 #undef FF_EMAIL_UI                                        
 
+/** #FF_EMAIL_UI_SPLITSCREEN 
+This feature enables split screen usage in email editors instead of touch input
+window
+*/
+#undef FF_EMAIL_UI_SPLITSCREEN                            
+
 /** #FF_EMPTY_COMMSDAT 
 The override flags FF_EMPTY_COMMSDAT, FF_VANILLA_COMMSDAT and FF_RND_COMMSDAT
 determine which default CommsDat will be put to the image independent of image
@@ -453,7 +507,7 @@
 KFeatureIdCertificationTesting and if system is in USB charging mode , then
 start USB components into the mode where ISI communication is possible.
 */
-#undef FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE   
+#define FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE   
 
 /** #FF_ENHANCED_CALENDAR_EVENT_UI 
 This flag controls inclusion of enhanced Calendar Event Viewers and Editors that
@@ -498,6 +552,13 @@
 */
 #undef FF_FMTX_RDS_TEXT                                   
 
+/** #FF_FOTA_CHECK_LIMITATION 
+When this flag is enabled user can only check for FOTA updates from the server
+once in defined time period. The time period is defined by a cenrep value -
+default value is 24h.
+*/
+#undef FF_FOTA_CHECK_LIMITATION                           
+
 /** #FF_FULLSCR_HWR_INPUT 
 Indicates whether a device needs fullscreen HWR (HandWritingRecognition) input
 or not.
@@ -637,6 +698,17 @@
 */
 #define FF_IMAGEPRINT_UPNP_PROTOCOL                        
 
+/** #FF_IMAGE_EDITOR 
+Feature flag for Image Editor support in the platform. Applications could check
+for this feature support and make use of it.
+Note: In Symbian Foundation context, Image Editor is not available in Sym ^3,
+hence there is a need to have feature flag in public domain. Other vendors can
+bring in their own implementation of the editor and make use of this flag to
+pulish the feature support.
+
+*/
+#undef FF_IMAGE_EDITOR                                    
+
 /** #FF_INCLUDE_CHINESE_DICTIONARY 
 This feature flag  controls the inclusion/exclusion of chinese dictionary in
 chinese variants. The flag is used in dictionary_variant.iby
@@ -659,6 +731,19 @@
 */
 #undef FF_INTELLIGENT_TEXT_INPUT                          
 
+/** #FF_IPSEC_UMA_SUPPORT_ENABLE 
+The default behaviour in IPSec policy conflict resolution logic is to put “Drop”
+mode over the “bypass” mode. Hence the resulting action is to drop the IP
+packets with the merged policies. 
+According to the default behaviour UMA is always with “bypass” property and
+whenever mVPN with drop mode connection rove-in or rove out from GAN (UMAN)
+results in a selector conflict. 
+
+With the macro enabled IPSec handles UMA conflict gracefully allowing UMA to
+work.
+*/
+#undef FF_IPSEC_UMA_SUPPORT_ENABLE                        
+
 /** #FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT 
 ITI feature (2nd generation text input features) are enabled in 5.0 & 9.1 TBD,
 i.e MCL, but these features are not supported in touch input modes like Virtual
@@ -902,6 +987,17 @@
 */
 #undef FF_OFN_FEATURE                                     
 
+/** #FF_OMADRM1_FULL_SUPPORT 
+This boolean feature flag indicates if OMA DRM v1 is fully (including combined
+delivery and separate delivery) supported or not. 
+*/
+#undef FF_OMADRM1_FULL_SUPPORT                            
+
+/** #FF_OMADRM2_SUPPORT 
+This boolean feature flag indicates if OMA DRM v2 is supported or not. 
+*/
+#undef FF_OMADRM2_SUPPORT                                 
+
 /** #FF_OMA_SCOMO_ADAPTER 
 This feature enables OMA SCOMO feature in "application management component".
 
@@ -913,7 +1009,13 @@
 ROM image.
 
 */
-#undef FF_OOM_MONITOR2_COMPONENT                          
+#define FF_OOM_MONITOR2_COMPONENT                          
+
+/** #FF_OPENMAX_AL 
+OpenMax AL is a Khronos API (http://www.khronos.org) included as a platform API
+to support QtMobility multimedia.
+*/
+#undef FF_OPENMAX_AL                                      
 
 /** #FF_OSS_LEGAL_NOTICE 
 This feature adds OSS legal notice to About application. The notice is needed if
@@ -953,6 +1055,12 @@
 */
 #undef FF_PLATFORM_SIMULATOR                              
 
+/** #FF_PLAYREADY_SUPPORT 
+This boolean feature flag indicates if PlayReady technology is supported or not.
+
+*/
+#undef FF_PLAYREADY_SUPPORT                               
+
 /** #FF_PNPMS_PROV_FILTER 
 On enabling this feature flag pnpprovfilter.dll will be created and this feature
 flag is used to enable PNPProvisioning HTTP filter which by passes the download
@@ -1092,6 +1200,24 @@
 */
 #undef FF_SHOW_MMPLAYER                                   
 
+/** #FF_SIDESLIDER_SUPPORT 
+To make the side slier support available at platform build which is currently
+not. System application requires this flag
+*/
+#undef FF_SIDESLIDER_SUPPORT                              
+
+/** #FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING 
+When this flag is enabled UI error note will shonwn in case of consecutive 6F 00
+errors from UICC (SIM card)
+*/
+#undef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING            
+
+/** #FF_SIP_APN_SWITCHING 
+Provides a mechanism to manipulate APN name of a IAP based SIP registration
+status
+*/
+#undef FF_SIP_APN_SWITCHING                               
+
 /** #FF_SIP_CUSTOM_PDP_HANDLING 
 Controls the handling of PDP activation failures in operator specified method
 */
@@ -1168,11 +1294,57 @@
 */
 #undef FF_TCP_MYPROFILE                                   
 
+/** #FF_TD_CLMContactReplicationFromPhonebookToUSIMCard 
+Support for CMCC standard USIM contact format. 
+
+*/
+#undef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard 
+
+/** #FF_TD_CMCCATCommandsSupport 
+When enabled, this flag will extend the set of supported AT commands
+• AT+CMGD (Delete message)
+• AT+CMGW (Write message to memory)
+• AT^HVER (Hardware version) 
+• AT^SYSINFO (System information query)
+• AT^DSCI (Call state indication)
+• AT^DMUX (Multiplexing)
+• AT^DDSETEX (Data card voice channel configuration)
+
+*/
+#undef FF_TD_CMCCATCommandsSupport                        
+
+/** #FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer 
+When this flag is enabled, the device will give appropriate UI prompt to the
+user, if status code 420 is received during data synchronization.
+
+*/
+#undef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer 
+
+/** #FF_TD_CMCCPIMSynchronizationProgressIndicatorUI  
+This flag enables an enhanced progress status UI. Instead of standard progress
+bar or percentage information, the UI will show following information:
+x/y for uplink (x = current item, y = total items) and z for downlink (z =
+current item).
+
+*/
+#undef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI    
+
 /** #FF_TD_SCDMA 
 This is a feature flag used to turn on/off TD-SCDMA releated features
 */
 #undef FF_TD_SCDMA                                        
 
+/** #FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY 
+This feature is used enable Forbidden operator icon display feature.
+
+*/
+#undef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY           
+
+/** #FF_TD_SCDMA_VIDEOCALL_KEY 
+This FF is used to enable video call key feature for TD-SCDMA product
+*/
+#undef FF_TD_SCDMA_VIDEOCALL_KEY                          
+
 /** #FF_THEME_HAZE 
 Haze theme is included in ROM image.
 
@@ -1294,6 +1466,17 @@
 */
 #undef FF_VIDEO_AUDIO_BRANDING                            
 
+/** #FF_VIDEO_EDITOR 
+Feature flag for Video Editor support in the platform. Applications could check
+for this feature support and make use of it.
+Note: In Symbian Foundation context, Video Editor is not available in Sym ^3,
+hence there is a need to have feature flag in public domain. Other vendors can
+bring in their own implementation of the editor and make use of this flag to
+pulish the feature support.
+
+*/
+#undef FF_VIDEO_EDITOR                                    
+
 /** #FF_VIRTUAL_FULLSCR_QWERTY_INPUT 
 Indicates whether a device needs Virtual full-screen qwerty input or not.
 
@@ -1334,6 +1517,14 @@
 */
 #undef FF_WEBVIDEO_PH2                                    
 
+/** #FF_WLAN_AUTHENTICATION_ONLY_SUPPORT 
+When defined, the flag enables support for WLAN connections that are
+authenticated but the agreed keys are not used for data frame protection. That
+is, data is transferred in plaintext and with no cryptographic integrity
+protection.
+*/
+#undef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT                
+
 /** #FF_WLAN_EXTENSIONS 
 Device supports extended WLAN functionalities e.g. for association and
 authentication.
@@ -1361,6 +1552,12 @@
 */
 #define FF_WLAN_WAPI_INCLUDE_IN_ROM                        
 
+/** #FF_WMDRM_DLA_SUPPORT 
+This boolean feature flag indicates if WMDRM Direct License Acquisition is
+supported or not.
+*/
+#undef FF_WMDRM_DLA_SUPPORT                               
+
 /** #FF_XML_IDLE_THEME_BASIC_IDLE 
 Controls if Basic idle theme is going to image or not.
 */

--- a/sf_config/config/inc/publicruntimeids.hrh	Fri Apr 02 11:47:01 2010 +0100
+++ b/sf_config/config/inc/publicruntimeids.hrh	Tue Apr 13 17:59:35 2010 +0100
@@ -31,10 +31,16 @@
 
 #define KFeatureIdFfAiWlansnifferWidget                     172
 
+#define KFeatureIdFfAlternativeCallWaitingTone              315
+
+#define KFeatureIdArabicHandwritingRecognitionInput         338
+
 #define KFeatureIdAsynchFileSaveQueue                       1703
 
 #define KFeatureIdFfAudt                                    63
 
+#define KFeatureIdFfAutomotivestack                         330
+
 #define KFeatureIdAutoRedialForVideoCall                    1723
 
 #define KFeatureIdFfAvkonEmotionIconEnabled                 211
@@ -47,6 +53,10 @@
 
 #define KFeatureIdBrowserProgressiveDownload                1724
 
+#define KFeatureIdFfCalDayView                              306
+
+#define KFeatureIdFfCalScrollablePreview                    307
+
 #define KFeatureIdFfCalMeetingRequestUi                     296
 
 #define KFeatureIdFfCapacitiveDisplay                       183
@@ -93,15 +103,21 @@
 
 #define KFeatureIdFfEmailFramework                          135
 
+#define KFeatureIdFfEmailFullscreenviewer                   325
+
 #define KFeatureIdFfEmailIpsServices                        137
 
 #define KFeatureIdEmailMceIntegration                       126
 
+#define KFeatureIdFfEmailPredictivesearch                   324
+
 #define KFeatureIdFfEmailProtocolPlugins                    215
 
 #define KFeatureIdFfEmailUi                                 136
 
-#define KFeatureIdCertificationTesting                      309
+#define KFeatureIdFfEmailUiSplitscreen                      323
+
+#define KFeatureIdEnableIsiCommunicationInUsbChargingMode   309
 
 #define KFeatureIdFfEnhancedCalendarEventUi                 295
 
@@ -111,6 +127,8 @@
 
 #define KFeatureIdFfFmtxRdsText                             220
 
+#define KFeatureIdFfFotaCheckLimitation                     326
+
 #define KFeatureIdFullscrHwrInput                           66
 
 #define KFeatureIdFfGenericAccessNetwork                    257
@@ -131,10 +149,14 @@
 
 #define KFeatureIdFfIaupdatePhase2                          185
 
+#define KFeatureIdFfImageEditor                             255
+
 #define KFeatureIdFfInputsPerOrientation                    192
 
 #define KFeatureIdFfIntelligentTextInput                    216
 
+#define KFeatureIdFfIpsecUmaSupportEnable                   332
+
 #define KFeatureIdFfItiVirtualTouchFirstGenerationSupport   218
 
 #define KFeatureIdFfJavaGlobalIndicatorsApi                 134
@@ -177,10 +199,16 @@
 
 #define KFeatureIdFfOfnFeature                              193
 
+#define KFeatureIdFfOmadrm1FullSupport                      329
+
+#define KFeatureIdFfOmadrm2Support                          328
+
 #define KFeatureIdFfOmaScomoAdapter                         197
 
 #define KFeatureIdFfOssLegalNotice                          196
 
+#define KFeatureIdFfPlayreadySupport                        322
+
 #define KFeatureIdFfPnpmsProvFilter                         133
 
 #define KFeatureIdPnpmsServiceHelpPlugin                    128
@@ -201,6 +229,12 @@
 
 #define KFeatureIdSelectableEmail                           125
 
+#define KFeatureIdFfSidesliderSupport                       320
+
+#define KFeatureIdFfSimConsecutive6f00ErrorsHandling        327
+
+#define KFeatureIdFfSipApnSwitching                         318
+
 #define KFeatureIdFfSipCustomPdpHandling                    269
 
 #define KFeatureIdFfSmallScreenTouch                        279
@@ -225,8 +259,20 @@
 
 #define KFeatureIdFfTcpMyprofile                            186
 
+#define KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard  337
+
+#define KFeatureIdFfTdCmccatcommandssupport                 336
+
+#define KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver  335
+
+#define KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui   334
+
 #define KFeatureIdFfTdScdma                                 274
 
+#define KFeatureIdFfTdScdmaForbiddenoperatoricondisplay     316
+
+#define KFeatureIdFfTdScdmaVideocallKey                     317
+
 #define KFeatureIdTouchscreencalibInStartup                 69
 
 #define KFeatureIdFfTouchUnlockStroke                       173
@@ -245,6 +291,8 @@
 
 #define KFeatureIdFfVideoAudioBranding                      266
 
+#define KFeatureIdFfVideoEditor                             256
+
 #define KFeatureIdVirtualFullscrQwertyInput                 64
 
 #define KFeatureIdVirtualItutInput                          65
@@ -257,10 +305,14 @@
 
 #define KFeatureIdWebvideoPh2                               39
 
+#define KFeatureIdFfWlanAuthenticationOnlySupport           314
+
 #define KFeatureIdFfWlanExtensions                          177
 
 #define KFeatureIdFfWlanWapi                                129
 
+#define KFeatureIdFfWmdrmDlaSupport                         310
+
 #define KFeatureIdSymbianIncludeLocationNpeDsm              261
 
 #define KFeatureIdSymbianIncludeLocationSuplPosInit         263