[ITC][system-settings][Non-ACR][Issue fix for system-settings:TNEXT-13062,TNEXT-13080...

Change-Id: I2133a2a8e29e8e8538f24f3d17a5154c954816c5
Signed-off-by: Shilpa Jindal <shilpa.j@samsung.com>

diff --git a/src/itc/system-settings/ITs-system-settings-common.h b/src/itc/system-settings/ITs-system-settings-common.h
index bc72c14..57ef011 100755 (executable)
--- a/src/itc/system-settings/ITs-system-settings-common.h
+++ b/src/itc/system-settings/ITs-system-settings-common.h
@@ -27,6 +27,16 @@
 #define API_NAMESPACE  "SYSTEM_SETTINGS_ITC"
 #define SYSTEM_SETTINGS_FEATURE        "http://tizen.org/feature/systemsetting"
 
+#define SYSTEM_SETTINGS_NETWORK_WIFI_FEATURE  "http://tizen.org/feature/network.wifi"
+#define SYSTEM_SETTINGS_FONT_FEATURE  "http://tizen.org/feature/systemsetting.font"
+#define SYSTEM_SETTINGS_WALLPAPER_HOME_SCREEN_FEATURE "http://tizen.org/feature/systemsetting.home_screen"
+#define SYSTEM_SETTINGS_LOCK_SCREEN_FEATURE "http://tizen.org/feature/systemsetting.lock_screen"
+#define SYSTEM_SETTINGS_NOTIFICATION_EMAIL_FEATURE "http://tizen.org/feature/systemsetting.notification_email"
+#define SYSTEM_SETTINGS_TELEPHONY_FEATURE "http://tizen.org/feature/network.telephony"
+#define SYSTEM_SETTINGS_INCOMING_CALL_FEATURE "http://tizen.org/feature/systemsetting.incoming_call" 
+
+
+
 #define START_TEST {\
        FPRINTF("[Line : %d][%s] Starting test : %s\\n", __LINE__, API_NAMESPACE, __FUNCTION__);\
 }

diff --git a/src/itc/system-settings/ITs-system-settings.c b/src/itc/system-settings/ITs-system-settings.c
index f212806..ea34f7f 100755 (executable)
--- a/src/itc/system-settings/ITs-system-settings.c
+++ b/src/itc/system-settings/ITs-system-settings.c
@@ -324,7 +324,40 @@ int ITc_system_settings_add_remove_changed_cb_p(void)
        for (nkey_idx = SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE; nkey_idx < SYSTEM_SETTINGS_KEY_MAX ; nkey_idx++)
        {
 
-               if ( nkey_idx == (SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED + 1) || nkey_idx == SYSTEM_SETTINGS_KEY_DEFAULT_FONT_TYPE)
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_NETWORK_WIFI_NOTIFICATION && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_NETWORK_WIFI_FEATURE,API_NAMESPACE)))
+               {
+                       continue;
+               }
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_FONT_TYPE  || nkey_idx == SYSTEM_SETTINGS_KEY_FONT_SIZE  && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_FONT_FEATURE, API_NAMESPACE)) )
+               {
+                       continue;
+               }
+
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP || nkey_idx == SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_LOCK_SCREEN_FEATURE, API_NAMESPACE)) )
+               {
+                       continue;
+               }
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE  || nkey_idx == SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_INCOMING_CALL_FEATURE, API_NAMESPACE)) )
+               {
+                       continue;
+               }
+
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE_PKG_LIST || nkey_idx == SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_TELEPHONY_FEATURE, API_NAMESPACE)) )
+               {
+                       continue;
+               }
+
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_WALLPAPER_HOME_SCREEN_FEATURE, API_NAMESPACE)) )
+               {
+                       continue;
+               }
+               
+               if(nkey_idx == SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE && (!TCTCheckSystemInfoFeatureSupported(SYSTEM_SETTINGS_NOTIFICATION_EMAIL_FEATURE, API_NAMESPACE)) )
+               {
+                       continue;
+               }
+                       
+               if ( nkey_idx == (SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED + 1) || nkey_idx == SYSTEM_SETTINGS_KEY_DEFAULT_FONT_TYPE )
                        continue;
 
                nRetVal = system_settings_add_changed_cb(nkey_idx,System_settings_changed_add_remove_cb, NULL);