From: nazib.ullah <nazib.ullah@samsung.com>
Date: Fri, 21 Oct 2016 10:35:06 +0000 (+0600)
Subject: [TBT][tizen_3.0_wearable][d2d moudle updated, feature list updated]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F93274%2F1;p=test%2Ftct%2Fnative%2Fbehavior.git

[TBT][tizen_3.0_wearable][d2d moudle updated, feature list updated]

Change-Id: I585ab437bb3991db6e57cfd8f13c36dfe94def09
---

diff --git a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index 97fbb3d..ad3595e 100644
Binary files a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
index 1a89f61..7009eea 100644
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ
diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h
index ad8abaf..66778b0 100644
--- a/tbtcoreapp/inc/model/tbt-info.h
+++ b/tbtcoreapp/inc/model/tbt-info.h
@@ -66,6 +66,7 @@ typedef enum {
     TBT_APP_BT_SERVER_SOCKET,
     TBT_APP_BT_CLIENT_SOCKET,
     TBT_APP_BT_HID_CONNECT,
+    TBT_APP_BT_HID_DEVICE,
     TBT_APP_BT_OOB_PERIPHERAL,
     TBT_APP_BT_OOB_DEVICE,
     TBT_APP_BT_AVRCP,
@@ -334,102 +335,418 @@ struct _tbt_info
 
 };
 
+typedef enum
+{
+	FEATURE_ACCOUNT = 0,
+	FEATURE_ARCHIVE,
+	FEATURE_BADGE,
+	FEATURE_BATTERY,
+	FEATURE_BOOKMARK,
+	FEATURE_CALENDAR,
+	FEATURE_CAMERA,
+	FEATURE_CAMERA_BACK,
+	FEATURE_CAMERA_BACK_FLASH,
+	FEATURE_CAMERA_FRONT,
+	FEATURE_CAMERA_FRONT_FLASH,
+	FEATURE_CONSUMER_IR,
+	FEATURE_CONTACT,
+	FEATURE_CONVERGENCE_D2D,
+	FEATURE_DATABASE_ENCRYPTION,
+	FEATURE_DATACONTROL,
+	FEATURE_DATASYNC,
+	FEATURE_DOWNLOAD,
+	FEATURE_EMAIL,
+	FEATURE_EXIF,
+	FEATURE_FMRADIO,
+	FEATURE_GRAPHICS_ACCELERATION,
+	FEATURE_HUMANACTIVITYMONITOR,
+	FEATURE_INPUT_KEYBOARD,
+	FEATURE_INPUT_KEYBOARD_LAYOUT,
+	FEATURE_INPUT_ROTATING_BEZEL,
+	FEATURE_IOT_OCF,
+	FEATURE_LED,
+	FEATURE_LOCATION,
+	FEATURE_LOCATION_BATCH,
+	FEATURE_LOCATION_GPS,
+	FEATURE_LOCATION_GPS_SATELLITE,
+	FEATURE_LOCATION_WPS,
+	FEATURE_LOCATION_COMPANION,
+	FEATURE_LOCATION_GEOFENCE,
+	FEATURE_MAPS,
+	FEATURE_MICROPHONE,
+	FEATURE_MULTI_POINT_TOUCH_PINCH_ZOOM,
+	FEATURE_MULTI_POINT_TOUCH_POINT_COUNT,
+	FEATURE_MULTIMEDIA_TRANSCODER,
+	FEATURE_NETWORK_INTERNET,
+	FEATURE_NETWORK_ETHERNET,
+	FEATURE_NETWORK_BLUETOOTH,
+	FEATURE_NETWORK_BLUETOOTH_AUDIO_CALL,
+	FEATURE_NETWORK_BLUETOOTH_AUDIO_MEDIA,
+	FEATURE_NETWORK_BLUETOOTH_AUDIO_CONTROLLER,
+	FEATURE_NETWORK_BLUETOOTH_HEALTH,
+	FEATURE_NETWORK_BLUETOOTH_HID,
+	FEATURE_NETWORK_BLUETOOTH_HID_DEVICE,
+	FEATURE_NETWORK_BLUETOOTH_LE,
+	FEATURE_NETWORK_BLUETOOTH_OPP,
+	FEATURE_NETWORK_BLUETOOTH_PHONEBOOK_CLIENT,
+	FEATURE_NETWORK_NFC,
+	FEATURE_NETWORK_NFC_TAG,
+	FEATURE_NETWORK_NFC_P2P,
+	FEATURE_NETWORK_NFC_CARD_EMULATION,
+	FEATURE_NETWORK_NFC_CARD_EMULATION_HCE,
+	FEATURE_NETWORK_NFC_RESERVED_PUSH,
+	FEATURE_NETWORK_MTP,
+	FEATURE_NETWORK_PUSH,
+	FEATURE_NETWORK_SECURE_ELEMENT,
+	FEATURE_NETWORK_SECURE_ELEMENT_ESE,
+	FEATURE_NETWORK_SECURE_ELEMENT_UICC,
+	FEATURE_NETWORK_SERVICE_DISCOVERY_DNSSD,
+	FEATURE_NETWORK_SERVICE_DISCOVERY_SSDP,
+	FEATURE_NETWORK_TELEPHONY,
+	FEATURE_NETWORK_TELEPHONY_SMS_CBS,
+	FEATURE_NETWORK_TELEPHONY_SMS,
+	FEATURE_NETWORK_TELEPHONY_MMS,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_CDMA,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_EDGE,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_GPRS,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_GSM,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_HSDPA,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_HSPA,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_HSUPA,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_LTE,
+	FEATURE_NETWORK_TELEPHONY_SERVICE_UMTS,
+	FEATURE_NETWORK_TETHERING,
+	FEATURE_NETWORK_TETHERING_BLUETOOTH,
+	FEATURE_NETWORK_TETHERING_USB,
+	FEATURE_NETWORK_TETHERING_WIFI,
+	FEATURE_NETWORK_WIFI,
+	FEATURE_NETWORK_WIFI_TDLS,
+	FEATURE_NETWORK_WIFI_DIRECT,
+	FEATURE_NETWORK_WIFI_DIRECT_DISPLAY,
+	FEATURE_NETWORK_WIFI_DIRECT_SERVICE_DISCOVERY,
+	FEATURE_NETWORK_VPN,
+	FEATURE_NOTIFICATION,
+	FEATURE_OPENGLES,
+	FEATURE_OPENGLES_TEXTURE_FORMAT_3DC,
+	FEATURE_OPENGLES_TEXTURE_FORMAT_ATC,
+	FEATURE_OPENGLES_TEXTURE_FORMAT_ETC,
+	FEATURE_OPENGLES_TEXTURE_FORMAT_PTC,
+	FEATURE_OPENGLES_TEXTURE_FORMAT_PVRTC,
+	FEATURE_OPENGLES_TEXTURE_FORMAT_UTC,
+	FEATURE_OPENGLES_VERSION_1_1,
+	FEATURE_OPENGLES_VERSION_2_0,
+	FEATURE_PLATFORM_CORE_CPU_ARCH,
+	FEATURE_PLATFORM_CORE_CPU_ARCH_ARMV6,
+	FEATURE_PLATFORM_CORE_CPU_ARCH_ARMV7,
+	FEATURE_PLATFORM_CORE_CPU_ARCH_X86,
+	FEATURE_PLATFORM_CORE_FPU_ARCH_SSE2,
+	FEATURE_PLATFORM_CORE_FPU_ARCH_SSE3,
+	FEATURE_PLATFORM_CORE_FPU_ARCH_SSSE3,
+	FEATURE_PLATFORM_CORE_FPU_ARCH_VFPV2,
+	FEATURE_PLATFORM_CORE_FPU_ARCH_VFPV3,
+	FEATURE_PLATFORM_NATIVE_API_VERSION,
+	FEATURE_PLATFORM_NATIVE_OSP_COMPATIBLE,
+	FEATURE_PLATFORM_WEB_API_VERSION,
+	FEATURE_PROFILE,
+	FEATURE_SCREEN_AUTO_ROTATION,
+	FEATURE_SCREEN_BPP,
+	FEATURE_SCREEN_COORDINATE_SYSTEM_SIZE_LARGE,
+	FEATURE_SCREEN_COORDINATE_SYSTEM_SIZE_NORMAL,
+	FEATURE_SCREEN_DPI,
+	FEATURE_SCREEN_HEIGHT,
+	FEATURE_SCREEN_OUTPUT_HDMI,
+	FEATURE_SCREEN_OUTPUT_RCA,
+	FEATURE_SCREEN_SIZE_ALL,
+	FEATURE_SCREEN_SIZE_LARGE,
+	FEATURE_SCREEN_SIZE_NORMAL,
+	FEATURE_SCREEN_SIZE_NORMAL_240_400,
+	FEATURE_SCREEN_SIZE_NORMAL_320_320,
+	FEATURE_SCREEN_SIZE_NORMAL_320_480,
+	FEATURE_SCREEN_SIZE_NORMAL_360_360,
+	FEATURE_SCREEN_SIZE_NORMAL_360_480,
+	FEATURE_SCREEN_SIZE_NORMAL_480_800,
+	FEATURE_SCREEN_SIZE_NORMAL_540_960,
+	FEATURE_SCREEN_SIZE_NORMAL_600_1024,
+	FEATURE_SCREEN_SIZE_NORMAL_720_1280,
+	FEATURE_SCREEN_SIZE_NORMAL_1080_1920,
+	FEATURE_SCREEN_SHAPE_CIRCLE,
+	FEATURE_SCREEN_SHAPE_RECTANGLE,
+	FEATURE_SCREEN_WIDTH,
+	FEATURE_SENSOR_ACCELEROMETER,
+	FEATURE_SENSOR_ACCELEROMETER_WAKEUP,
+	FEATURE_SENSOR_ACTIVITY_RECOGNITION,
+	FEATURE_SENSOR_BAROMETER,
+	FEATURE_SENSOR_BAROMETER_WAKEUP,
+	FEATURE_SENSOR_BIO,
+	FEATURE_SENSOR_GEOMAGNETIC_ROTATION_VECTOR,
+	FEATURE_SENSOR_GESTURE_RECOGNITION,
+	FEATURE_SENSOR_GRAVITY,
+	FEATURE_SENSOR_GYROSCOPE,
+	FEATURE_SENSOR_GYROSCOPE_UNCALIBRATED,
+	FEATURE_SENSOR_GYROSCOPE_WAKEUP,
+	FEATURE_SENSOR_GYROSCOPE_ROTATION_VECTOR,
+	FEATURE_SENSOR_HEART_RATE_MONITOR,
+	FEATURE_SENSOR_HEART_RATE_MONITOR_LED_GREEN,
+	FEATURE_SENSOR_HEART_RATE_MONITOR_LED_IR,
+	FEATURE_SENSOR_HEART_RATE_MONITOR_LED_RED,
+	FEATURE_SENSOR_HUMIDITY,
+	FEATURE_SENSOR_LINEAR_ACCELERATION,
+	FEATURE_SENSOR_MAGNETOMETER,
+	FEATURE_SENSOR_MAGNETOMETER_UNCALIBRATED,
+	FEATURE_SENSOR_MAGNETOMETER_WAKEUP,
+	FEATURE_SENSOR_PEDOMETER,
+	FEATURE_SENSOR_PHOTOMETER,
+	FEATURE_SENSOR_PHOTOMETER_WAKEUP,
+	FEATURE_SENSOR_PROXIMITY,
+	FEATURE_SENSOR_PROXIMITY_WAKEUP,
+	FEATURE_SENSOR_ROTATION_VECTOR,
+	FEATURE_SENSOR_SLEEP_MONITOR,
+	FEATURE_SENSOR_STRESS_MONITOR,
+	FEATURE_SENSOR_TEMPERATURE,
+	FEATURE_SENSOR_TILTMETER,
+	FEATURE_SENSOR_TILTMETER_WAKEUP,
+	FEATURE_SENSOR_ULTRAVIOLET,
+	FEATURE_SENSOR_WRIST_UP,
+	FEATURE_SHELL_APPWIDGET,
+	FEATURE_SIP_VOIP,
+	FEATURE_SPEECH_RECOGNITION,
+	FEATURE_SPEECH_SYNTHESIS,
+	FEATURE_SPEECH_CONTROL,
+	FEATURE_SYSTEMSETTING,
+	FEATURE_SYSTEMSETTING_HOME_SCREEN,
+	FEATURE_SYSTEMSETTING_LOCK_SCREEN,
+	FEATURE_SYSTEMSETTING_INCOMING_CALL,
+	FEATURE_SYSTEMSETTING_NOTIFICATION_EMAIL,
+	FEATURE_USB_ACCESSORY,
+	FEATURE_USB_HOST,
+	FEATURE_VISION_BARCODE_DETECTION,
+	FEATURE_VISION_BARCODE_GENERATION,
+	FEATURE_VISION_FACE_RECOGNITION,
+	FEATURE_VISION_IMAGE_RECOGNITION,
+	FEATURE_VISION_QRCODE_GENERATION,
+	FEATURE_VISION_QRCODE_RECOGNITION,
+	FEATURE_WEB_IME,
+	FEATURE_WEB_SERVICE,
+	FEATURE_WEBSETTING,
+	FEATURE_TIZEN_ORG_SYSTEM_SOUND_MEDIA_VOLUME_RESOLUTION_MAX,
+	FEATURE_TIZEN_ORG_SYSTEM_SOUND_NOTIFICATION_VOLUME_RESOLUTION_MAX,
+	FEATURE_TIZEN_ORG_SYSTEM_SOUND_RINGTONE_VOLUME_RESOLUTION_MAX,
+	FEATURE_TIZEN_ORG_SYSTEM_SOUND_SYSTEM_VOLUME_RESOLUTION_MAX,
+	FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_VOLUME,
+	FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_MENU,
+	FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_BACK,
+	FEATURE_FIDO_UAF,
+
+	ALL_FEATURES
+
+}features_e;
+
 /**
  * @brief Feature List
  * @since_tizen 2.3
  */
-static char *feature_list[1024] =
+static char* feature_list[1024]=
 {
-	"tizen.org/feature/camera",
-	"tizen.org/feature/camera.back",
-	"tizen.org/feature/camera.back.flash",
-	"tizen.org/feature/camera.front",
-	"tizen.org/feature/camera.front.flash",
-	"tizen.org/feature/database.encryption",
-	"tizen.org/feature/fmradio",
-	"tizen.org/feature/graphics.acceleration",
-	"tizen.org/feature/input.keyboard",
-	"tizen.org/feature/input.keyboard.layout",
-	"tizen.org/feature/location",
-	"tizen.org/feature/location.gps",
-	"tizen.org/feature/location.wps",
-	"tizen.org/feature/microphone",
-	"tizen.org/feature/multi_point_touch.point_count",
-	"tizen.org/feature/multi_point_touch.pinch_zoom",
-	"tizen.org/feature/network.bluetooth",
-	"tizen.org/feature/network.nfc",
-	"tizen.org/feature/network.nfc.reserved_push",
-	"tizen.org/feature/network.push",
-	"tizen.org/feature/network.secure_element",
-	"tizen.org/feature/network.telephony",
-	"tizen.org/feature/network.telephony.mms",
-	"tizen.org/feature/network.telephony.sms.cbs",
-	"tizen.org/feature/network.wifi",
-	"tizen.org/feature/network.wifi.direct",
-	"tizen.org/feature/opengles.texture_format.3dc",
-	"tizen.org/feature/opengles.texture_format.atc",
-	"tizen.org/feature/opengles.texture_format.etc",
-	"tizen.org/feature/opengles.texture_format.ptc",
-	"tizen.org/feature/opengles.texture_format.pvrtc",
-	"tizen.org/feature/opengles.texture_format.utc",
-	"tizen.org/feature/opengles.version.1_1",
-	"tizen.org/feature/opengles.version.2_0",
-	"tizen.org/feature/platform.core.cpu.arch.armv7",
-	"tizen.org/feature/platform.core.fpu.arch.sse2",
-	"tizen.org/feature/platform.core.fpu.arch.sse3",
-	"tizen.org/feature/platform.core.fpu.arch.ssse3",
-	"tizen.org/feature/platform.core.fpu.arch.vfpv3",
-	"tizen.org/feature/platform.core.cpu.arch.x86",
-	"tizen.org/feature/platform.native.osp_compatible",
-	"tizen.org/feature/screen.auto_rotation",
-	"tizen.org/feature/sensor.accelerometer",
-	"tizen.org/feature/sensor.accelerometer.wakeup",
-	"tizen.org/feature/sensor.gyroscope",
-	"tizen.org/feature/sensor.gyroscope.wakeup",
-	"tizen.org/feature/sensor.magnetometer",
-	"tizen.org/feature/sensor.magnetometer.wakeup",
-	"tizen.org/feature/sensor.proximity",
-	"tizen.org/feature/sensor.proximity.wakeup",
-	"tizen.org/feature/sensor.tiltmeter",
-	"tizen.org/feature/sensor.tiltmeter.wakeup",
-	"tizen.org/feature/shell.appwidget",
-	"tizen.org/feature/network.bluetooth",
-	"tizen.org/feature/sip.voip",
-	"tizen.org/feature/speech.recognition",
-	"tizen.org/feature/speech.synthesis",
-	"tizen.org/feature/usb.accessory",
-	"tizen.org/feature/usb.host",
-	"tizen.org/feature/vision.face_recognition",
-	"tizen.org/feature/vision.image_recognition",
-	"tizen.org/feature/vision.qrcode_generation",
-	"tizen.org/feature/vision.qrcode_recognition",
-	"tizen.org/feature/bluetooth",
-	"tizen.org/feature/bluetooth.le",
-	"tizen.org/feature/network.bluetooth.le",
-	"tizen.org/feature/bluetooth.audio.media",
-	"tizen.org/feature/network.bluetooth.audio.media",
-	"tizen.org/feature/bluetooth.audio.call",
-	"tizen.org/feature/network.bluetooth.audio.call",
-	"tizen.org/feature/bluetooth.hdp",
-	"tizen.org/feature/network.bluetooth.hdp"
-	"tizen.org/feature/bluetooth.hid",
-	"tizen.org/feature/network.bluetooth.hid",
-	"tizen.org/feature/bluetooth.opp",
-	"tizen.org/feature/network.bluetooth.opp",
-	"tizen.org/feature/bluetooth.spp",
-	"tizen.org/feature/network.nfc.p2p",
-	"tizen.org/feature/network.nfc.tag",
-	"tizen.org/feature/sensor.photometer",
-	"tizen.org/feature/sensor.ultraviolet",
-	"tizen.org/feature/notification",
-	"tizen.org/feature/network.nfc.card_emulation.hce",
-	"tizen.org/feature/network.telephony",
-	"tizen.org/feature/network.service_discovery.dnssd",
-	"tizen.org/feature/network.service_discovery.ssdp",
-	"tizen.org/feature/network.bluetooth.health",
-	"tizen.org/feature/sensor.barometer",
-	"tizen.org/feature/network.wifi.direct.display",
-	"tizen.org/feature/network.internet"
+
+	[FEATURE_ACCOUNT] = "tizen.org/feature/account",
+	[FEATURE_ARCHIVE] = "tizen.org/feature/archive",
+	[FEATURE_BADGE] = "tizen.org/feature/badge",
+	[FEATURE_BATTERY] = "tizen.org/feature/battery",
+	[FEATURE_BOOKMARK] = "tizen.org/feature/bookmark",
+	[FEATURE_CALENDAR] = "tizen.org/feature/calendar",
+	[FEATURE_CAMERA] = "tizen.org/feature/camera",
+	[FEATURE_CAMERA_BACK] = "tizen.org/feature/camera.back",
+	[FEATURE_CAMERA_BACK_FLASH] = "tizen.org/feature/camera.back.flash",
+	[FEATURE_CAMERA_FRONT] = "tizen.org/feature/camera.front",
+	[FEATURE_CAMERA_FRONT_FLASH] = "tizen.org/feature/camera.front.flash",
+	[FEATURE_CONSUMER_IR] = "tizen.org/feature/consumer_ir",
+	[FEATURE_CONTACT] = "tizen.org/feature/contact",
+	[FEATURE_CONVERGENCE_D2D] = "tizen.org/feature/convergence.d2d",
+	[FEATURE_DATABASE_ENCRYPTION] = "tizen.org/feature/database.encryption",
+	[FEATURE_DATACONTROL] = "tizen.org/feature/datacontrol",
+	[FEATURE_DATASYNC] = "tizen.org/feature/datasync",
+	[FEATURE_DOWNLOAD] = "tizen.org/feature/download",
+	[FEATURE_EMAIL] = "tizen.org/feature/email",
+	[FEATURE_EXIF] = "tizen.org/feature/exif",
+	[FEATURE_FMRADIO] = "tizen.org/feature/fmradio",
+	[FEATURE_GRAPHICS_ACCELERATION] = "tizen.org/feature/graphics.acceleration",
+	[FEATURE_HUMANACTIVITYMONITOR] = "tizen.org/feature/humanactivitymonitor",
+	[FEATURE_INPUT_KEYBOARD] = "tizen.org/feature/input.keyboard",
+	[FEATURE_INPUT_KEYBOARD_LAYOUT] = "tizen.org/feature/input.keyboard.layout",
+	[FEATURE_INPUT_ROTATING_BEZEL] = "tizen.org/feature/input.rotating_bezel",
+	[FEATURE_IOT_OCF] = "tizen.org/feature/iot.ocf",
+	[FEATURE_LED] = "tizen.org/feature/led",
+	[FEATURE_LOCATION] = "tizen.org/feature/location",
+	[FEATURE_LOCATION_BATCH] = "tizen.org/feature/location.batch",
+	[FEATURE_LOCATION_GPS] = "tizen.org/feature/location.gps",
+	[FEATURE_LOCATION_GPS_SATELLITE] = "tizen.org/feature/location.gps.satellite",
+	[FEATURE_LOCATION_WPS] = "tizen.org/feature/location.wps",
+	[FEATURE_LOCATION_COMPANION] = "tizen.org/feature/location.companion",
+	[FEATURE_LOCATION_GEOFENCE] = "tizen.org/feature/location.geofence",
+	[FEATURE_MAPS] = "tizen.org/feature/maps",
+	[FEATURE_MICROPHONE] = "tizen.org/feature/microphone",
+	[FEATURE_MULTI_POINT_TOUCH_PINCH_ZOOM] = "tizen.org/feature/multi_point_touch.pinch_zoom",
+	[FEATURE_MULTI_POINT_TOUCH_POINT_COUNT] = "tizen.org/feature/multi_point_touch.point_count",
+	[FEATURE_MULTIMEDIA_TRANSCODER] = "tizen.org/feature/multimedia.transcoder",
+	[FEATURE_NETWORK_INTERNET] = "tizen.org/feature/network.internet",
+	[FEATURE_NETWORK_ETHERNET] = "tizen.org/feature/network.ethernet",
+	[FEATURE_NETWORK_BLUETOOTH] = "tizen.org/feature/network.bluetooth",
+	[FEATURE_NETWORK_BLUETOOTH_AUDIO_CALL] = "tizen.org/feature/network.bluetooth.audio.call",
+	[FEATURE_NETWORK_BLUETOOTH_AUDIO_MEDIA] = "tizen.org/feature/network.bluetooth.audio.media",
+	[FEATURE_NETWORK_BLUETOOTH_AUDIO_CONTROLLER] = "tizen.org/feature/network.bluetooth.audio.controller",
+	[FEATURE_NETWORK_BLUETOOTH_HEALTH] = "tizen.org/feature/network.bluetooth.health",
+	[FEATURE_NETWORK_BLUETOOTH_HID] = "tizen.org/feature/network.bluetooth.hid",
+	[FEATURE_NETWORK_BLUETOOTH_HID_DEVICE] = "tizen.org/feature/network.bluetooth.hid_device",
+	[FEATURE_NETWORK_BLUETOOTH_LE] = "tizen.org/feature/network.bluetooth.le",
+	[FEATURE_NETWORK_BLUETOOTH_OPP] = "tizen.org/feature/network.bluetooth.opp",
+	[FEATURE_NETWORK_BLUETOOTH_PHONEBOOK_CLIENT] = "tizen.org/feature/network.bluetooth.phonebook.client",
+	[FEATURE_NETWORK_NFC] = "tizen.org/feature/network.nfc",
+	[FEATURE_NETWORK_NFC_TAG] = "tizen.org/feature/network.nfc.tag",
+	[FEATURE_NETWORK_NFC_P2P] = "tizen.org/feature/network.nfc.p2p",
+	[FEATURE_NETWORK_NFC_CARD_EMULATION] = "tizen.org/feature/network.nfc.card_emulation",
+	[FEATURE_NETWORK_NFC_CARD_EMULATION_HCE] = "tizen.org/feature/network.nfc.card_emulation.hce",
+	[FEATURE_NETWORK_NFC_RESERVED_PUSH] = "tizen.org/feature/network.nfc.reserved_push",
+	[FEATURE_NETWORK_MTP] = "tizen.org/feature/network.mtp",
+	[FEATURE_NETWORK_PUSH] = "tizen.org/feature/network.push",
+	[FEATURE_NETWORK_SECURE_ELEMENT] = "tizen.org/feature/network.secure_element",
+	[FEATURE_NETWORK_SECURE_ELEMENT_ESE] = "tizen.org/feature/network.secure_element.ese",
+	[FEATURE_NETWORK_SECURE_ELEMENT_UICC] = "tizen.org/feature/network.secure_element.uicc",
+	[FEATURE_NETWORK_SERVICE_DISCOVERY_DNSSD] = "tizen.org/feature/network.service_discovery.dnssd",
+	[FEATURE_NETWORK_SERVICE_DISCOVERY_SSDP] = "tizen.org/feature/network.service_discovery.ssdp",
+	[FEATURE_NETWORK_TELEPHONY] = "tizen.org/feature/network.telephony",
+	[FEATURE_NETWORK_TELEPHONY_SMS_CBS] = "tizen.org/feature/network.telephony.sms.cbs",
+	[FEATURE_NETWORK_TELEPHONY_SMS] = "tizen.org/feature/network.telephony.sms",
+	[FEATURE_NETWORK_TELEPHONY_MMS] = "tizen.org/feature/network.telephony.mms",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_CDMA] = "tizen.org/feature/network.telephony.service.cdma",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_EDGE] = "tizen.org/feature/network.telephony.service.edge",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_GPRS] = "tizen.org/feature/network.telephony.service.gprs",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_GSM] = "tizen.org/feature/network.telephony.service.gsm",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_HSDPA] = "tizen.org/feature/network.telephony.service.hsdpa",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_HSPA] = "tizen.org/feature/network.telephony.service.hspa",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_HSUPA] = "tizen.org/feature/network.telephony.service.hsupa",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_LTE] = "tizen.org/feature/network.telephony.service.lte",
+	[FEATURE_NETWORK_TELEPHONY_SERVICE_UMTS] = "tizen.org/feature/network.telephony.service.umts",
+	[FEATURE_NETWORK_TETHERING] = "tizen.org/feature/network.tethering",
+	[FEATURE_NETWORK_TETHERING_BLUETOOTH] = "tizen.org/feature/network.tethering.bluetooth",
+	[FEATURE_NETWORK_TETHERING_USB] = "tizen.org/feature/network.tethering.usb",
+	[FEATURE_NETWORK_TETHERING_WIFI] = "tizen.org/feature/network.tethering.wifi",
+	[FEATURE_NETWORK_WIFI] = "tizen.org/feature/network.wifi",
+	[FEATURE_NETWORK_WIFI_TDLS] = "tizen.org/feature/network.wifi.tdls",
+	[FEATURE_NETWORK_WIFI_DIRECT] = "tizen.org/feature/network.wifi.direct",
+	[FEATURE_NETWORK_WIFI_DIRECT_DISPLAY] = "tizen.org/feature/network.wifi.direct.display",
+	[FEATURE_NETWORK_WIFI_DIRECT_SERVICE_DISCOVERY] = "tizen.org/feature/network.wifi.direct.service_discovery",
+	[FEATURE_NETWORK_VPN] = "tizen.org/feature/network.vpn",
+	[FEATURE_NOTIFICATION] = "tizen.org/feature/notification",
+	[FEATURE_OPENGLES] = "tizen.org/feature/opengles",
+	[FEATURE_OPENGLES_TEXTURE_FORMAT_3DC] = "tizen.org/feature/opengles.texture_format.3dc",
+	[FEATURE_OPENGLES_TEXTURE_FORMAT_ATC] = "tizen.org/feature/opengles.texture_format.atc",
+	[FEATURE_OPENGLES_TEXTURE_FORMAT_ETC] = "tizen.org/feature/opengles.texture_format.etc",
+	[FEATURE_OPENGLES_TEXTURE_FORMAT_PTC] = "tizen.org/feature/opengles.texture_format.ptc",
+	[FEATURE_OPENGLES_TEXTURE_FORMAT_PVRTC] = "tizen.org/feature/opengles.texture_format.pvrtc",
+	[FEATURE_OPENGLES_TEXTURE_FORMAT_UTC] = "tizen.org/feature/opengles.texture_format.utc",
+	[FEATURE_OPENGLES_VERSION_1_1] = "tizen.org/feature/opengles.version.1_1",
+	[FEATURE_OPENGLES_VERSION_2_0] = "tizen.org/feature/opengles.version.2_0",
+	[FEATURE_PLATFORM_CORE_CPU_ARCH] = "tizen.org/feature/platform.core.cpu.arch",
+	[FEATURE_PLATFORM_CORE_CPU_ARCH_ARMV6] = "tizen.org/feature/platform.core.cpu.arch.armv6",
+	[FEATURE_PLATFORM_CORE_CPU_ARCH_ARMV7] = "tizen.org/feature/platform.core.cpu.arch.armv7",
+	[FEATURE_PLATFORM_CORE_CPU_ARCH_X86] = "tizen.org/feature/platform.core.cpu.arch.x86",
+	[FEATURE_PLATFORM_CORE_FPU_ARCH_SSE2] = "tizen.org/feature/platform.core.fpu.arch.sse2",
+	[FEATURE_PLATFORM_CORE_FPU_ARCH_SSE3] = "tizen.org/feature/platform.core.fpu.arch.sse3",
+	[FEATURE_PLATFORM_CORE_FPU_ARCH_SSSE3] = "tizen.org/feature/platform.core.fpu.arch.ssse3",
+	[FEATURE_PLATFORM_CORE_FPU_ARCH_VFPV2] = "tizen.org/feature/platform.core.fpu.arch.vfpv2",
+	[FEATURE_PLATFORM_CORE_FPU_ARCH_VFPV3] = "tizen.org/feature/platform.core.fpu.arch.vfpv3",
+	[FEATURE_PLATFORM_NATIVE_API_VERSION] = "tizen.org/feature/platform.native.api.version",
+	[FEATURE_PLATFORM_NATIVE_OSP_COMPATIBLE] = "tizen.org/feature/platform.native.osp_compatible",
+	[FEATURE_PLATFORM_WEB_API_VERSION] = "tizen.org/feature/platform.web.api.version",
+	[FEATURE_PROFILE] = "tizen.org/feature/profile",
+	[FEATURE_SCREEN_AUTO_ROTATION] = "tizen.org/feature/screen.auto_rotation",
+	[FEATURE_SCREEN_BPP] = "tizen.org/feature/screen.bpp",
+	[FEATURE_SCREEN_COORDINATE_SYSTEM_SIZE_LARGE] = "tizen.org/feature/screen.coordinate_system.size.large",
+	[FEATURE_SCREEN_COORDINATE_SYSTEM_SIZE_NORMAL] = "tizen.org/feature/screen.coordinate_system.size.normal",
+	[FEATURE_SCREEN_DPI] = "tizen.org/feature/screen.dpi",
+	[FEATURE_SCREEN_HEIGHT] = "tizen.org/feature/screen.height",
+	[FEATURE_SCREEN_OUTPUT_HDMI] = "tizen.org/feature/screen.output.hdmi",
+	[FEATURE_SCREEN_OUTPUT_RCA] = "tizen.org/feature/screen.output.rca",
+	[FEATURE_SCREEN_SIZE_ALL] = "tizen.org/feature/screen.size.all",
+	[FEATURE_SCREEN_SIZE_LARGE] = "tizen.org/feature/screen.size.large",
+	[FEATURE_SCREEN_SIZE_NORMAL] = "tizen.org/feature/screen.size.normal",
+	[FEATURE_SCREEN_SIZE_NORMAL_240_400] = "tizen.org/feature/screen.size.normal.240.400",
+	[FEATURE_SCREEN_SIZE_NORMAL_320_320] = "tizen.org/feature/screen.size.normal.320.320",
+	[FEATURE_SCREEN_SIZE_NORMAL_320_480] = "tizen.org/feature/screen.size.normal.320.480",
+	[FEATURE_SCREEN_SIZE_NORMAL_360_360] = "tizen.org/feature/screen.size.normal.360.360",
+	[FEATURE_SCREEN_SIZE_NORMAL_360_480] = "tizen.org/feature/screen.size.normal.360.480",
+	[FEATURE_SCREEN_SIZE_NORMAL_480_800] = "tizen.org/feature/screen.size.normal.480.800",
+	[FEATURE_SCREEN_SIZE_NORMAL_540_960] = "tizen.org/feature/screen.size.normal.540.960",
+	[FEATURE_SCREEN_SIZE_NORMAL_600_1024] = "tizen.org/feature/screen.size.normal.600.1024",
+	[FEATURE_SCREEN_SIZE_NORMAL_720_1280] = "tizen.org/feature/screen.size.normal.720.1280",
+	[FEATURE_SCREEN_SIZE_NORMAL_1080_1920] = "tizen.org/feature/screen.size.normal.1080.1920",
+	[FEATURE_SCREEN_SHAPE_CIRCLE] = "tizen.org/feature/screen.shape.circle",
+	[FEATURE_SCREEN_SHAPE_RECTANGLE] = "tizen.org/feature/screen.shape.rectangle",
+	[FEATURE_SCREEN_WIDTH] = "tizen.org/feature/screen.width",
+	[FEATURE_SENSOR_ACCELEROMETER] = "tizen.org/feature/sensor.accelerometer",
+	[FEATURE_SENSOR_ACCELEROMETER_WAKEUP] = "tizen.org/feature/sensor.accelerometer.wakeup",
+	[FEATURE_SENSOR_ACTIVITY_RECOGNITION] = "tizen.org/feature/sensor.activity_recognition",
+	[FEATURE_SENSOR_BAROMETER] = "tizen.org/feature/sensor.barometer",
+	[FEATURE_SENSOR_BAROMETER_WAKEUP] = "tizen.org/feature/sensor.barometer.wakeup",
+	[FEATURE_SENSOR_BIO] = "tizen.org/feature/sensor.bio",
+	[FEATURE_SENSOR_GEOMAGNETIC_ROTATION_VECTOR] = "tizen.org/feature/sensor.geomagnetic_rotation_vector",
+	[FEATURE_SENSOR_GESTURE_RECOGNITION] = "tizen.org/feature/sensor.gesture_recognition",
+	[FEATURE_SENSOR_GRAVITY] = "tizen.org/feature/sensor.gravity",
+	[FEATURE_SENSOR_GYROSCOPE] = "tizen.org/feature/sensor.gyroscope",
+	[FEATURE_SENSOR_GYROSCOPE_UNCALIBRATED] = "tizen.org/feature/sensor.gyroscope.uncalibrated",
+	[FEATURE_SENSOR_GYROSCOPE_WAKEUP] = "tizen.org/feature/sensor.gyroscope.wakeup",
+	[FEATURE_SENSOR_GYROSCOPE_ROTATION_VECTOR] = "tizen.org/feature/sensor.gyroscope_rotation_vector",
+	[FEATURE_SENSOR_HEART_RATE_MONITOR] = "tizen.org/feature/sensor.heart_rate_monitor",
+	[FEATURE_SENSOR_HEART_RATE_MONITOR_LED_GREEN] = "tizen.org/feature/sensor.heart_rate_monitor.led_green",
+	[FEATURE_SENSOR_HEART_RATE_MONITOR_LED_IR] = "tizen.org/feature/sensor.heart_rate_monitor.led_ir",
+	[FEATURE_SENSOR_HEART_RATE_MONITOR_LED_RED] = "tizen.org/feature/sensor.heart_rate_monitor.led_red",
+	[FEATURE_SENSOR_HUMIDITY] = "tizen.org/feature/sensor.humidity",
+	[FEATURE_SENSOR_LINEAR_ACCELERATION] = "tizen.org/feature/sensor.linear_acceleration",
+	[FEATURE_SENSOR_MAGNETOMETER] = "tizen.org/feature/sensor.magnetometer",
+	[FEATURE_SENSOR_MAGNETOMETER_UNCALIBRATED] = "tizen.org/feature/sensor.magnetometer.uncalibrated",
+	[FEATURE_SENSOR_MAGNETOMETER_WAKEUP] = "tizen.org/feature/sensor.magnetometer.wakeup",
+	[FEATURE_SENSOR_PEDOMETER] = "tizen.org/feature/sensor.pedometer",
+	[FEATURE_SENSOR_PHOTOMETER] = "tizen.org/feature/sensor.photometer",
+	[FEATURE_SENSOR_PHOTOMETER_WAKEUP] = "tizen.org/feature/sensor.photometer.wakeup",
+	[FEATURE_SENSOR_PROXIMITY] = "tizen.org/feature/sensor.proximity",
+	[FEATURE_SENSOR_PROXIMITY_WAKEUP] = "tizen.org/feature/sensor.proximity.wakeup",
+	[FEATURE_SENSOR_ROTATION_VECTOR] = "tizen.org/feature/sensor.rotation_vector",
+	[FEATURE_SENSOR_SLEEP_MONITOR] = "tizen.org/feature/sensor.sleep_monitor",
+	[FEATURE_SENSOR_STRESS_MONITOR] = "tizen.org/feature/sensor.stress_monitor",
+	[FEATURE_SENSOR_TEMPERATURE] = "tizen.org/feature/sensor.temperature",
+	[FEATURE_SENSOR_TILTMETER] = "tizen.org/feature/sensor.tiltmeter",
+	[FEATURE_SENSOR_TILTMETER_WAKEUP] = "tizen.org/feature/sensor.tiltmeter.wakeup",
+	[FEATURE_SENSOR_ULTRAVIOLET] = "tizen.org/feature/sensor.ultraviolet",
+	[FEATURE_SENSOR_WRIST_UP] = "tizen.org/feature/sensor.wrist_up",
+	[FEATURE_SHELL_APPWIDGET] = "tizen.org/feature/shell.appwidget",
+	[FEATURE_SIP_VOIP] = "tizen.org/feature/sip.voip",
+	[FEATURE_SPEECH_RECOGNITION] = "tizen.org/feature/speech.recognition",
+	[FEATURE_SPEECH_SYNTHESIS] = "tizen.org/feature/speech.synthesis",
+	[FEATURE_SPEECH_CONTROL] = "tizen.org/feature/speech.control",
+	[FEATURE_SYSTEMSETTING] = "tizen.org/feature/systemsetting",
+	[FEATURE_SYSTEMSETTING_HOME_SCREEN] = "tizen.org/feature/systemsetting.home_screen",
+	[FEATURE_SYSTEMSETTING_LOCK_SCREEN] = "tizen.org/feature/systemsetting.lock_screen",
+	[FEATURE_SYSTEMSETTING_INCOMING_CALL] = "tizen.org/feature/systemsetting.incoming_call",
+	[FEATURE_SYSTEMSETTING_NOTIFICATION_EMAIL] = "tizen.org/feature/systemsetting.notification_email",
+	[FEATURE_USB_ACCESSORY] = "tizen.org/feature/usb.accessory",
+	[FEATURE_USB_HOST] = "tizen.org/feature/usb.host",
+	[FEATURE_VISION_BARCODE_DETECTION] = "tizen.org/feature/vision.barcode_detection",
+	[FEATURE_VISION_BARCODE_GENERATION] = "tizen.org/feature/vision.barcode_generation",
+	[FEATURE_VISION_FACE_RECOGNITION] = "tizen.org/feature/vision.face_recognition",
+	[FEATURE_VISION_IMAGE_RECOGNITION] = "tizen.org/feature/vision.image_recognition",
+	[FEATURE_VISION_QRCODE_GENERATION] = "tizen.org/feature/vision.qrcode_generation",
+	[FEATURE_VISION_QRCODE_RECOGNITION] = "tizen.org/feature/vision.qrcode_recognition",
+	[FEATURE_WEB_IME] = "tizen.org/feature/web.ime",
+	[FEATURE_WEB_SERVICE] = "tizen.org/feature/web.service",
+	[FEATURE_WEBSETTING] = "tizen.org/feature/websetting",
+	[FEATURE_TIZEN_ORG_SYSTEM_SOUND_MEDIA_VOLUME_RESOLUTION_MAX] = "tizen.org/system/sound.media.volume.resolution.max",
+	[FEATURE_TIZEN_ORG_SYSTEM_SOUND_NOTIFICATION_VOLUME_RESOLUTION_MAX] = "tizen.org/system/sound.notification.volume.resolution.max",
+	[FEATURE_TIZEN_ORG_SYSTEM_SOUND_RINGTONE_VOLUME_RESOLUTION_MAX] = "tizen.org/system/sound.ringtone.volume.resolution.max",
+	[FEATURE_TIZEN_ORG_SYSTEM_SOUND_SYSTEM_VOLUME_RESOLUTION_MAX] = "tizen.org/system/sound.system.volume.resolution.max",
+	[FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_VOLUME] = "tizen.org/system/input.key.volume",
+	[FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_MENU] = "tizen.org/system/input.key.menu",
+	[FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_BACK] = "tizen.org/system/input.key.back",
+	[FEATURE_FIDO_UAF] = "tizen.org/feature/fido.uaf"
 
 };
 
diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index d7a1e7d..9d2169d 100644
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -49,7 +49,7 @@ static tbt_info tbtapps[] =
 					"2. Check the captured picture which is shown automatically.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = { 0 }
+			.features_required = {FEATURE_CAMERA}
 		},
 	#endif
 
@@ -68,7 +68,7 @@ static tbt_info tbtapps[] =
 					"3. Check the recorded video clip which is shown automatically.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {0 }
+			.features_required = {FEATURE_CAMERA}
 		},
 	#endif
 
@@ -84,7 +84,7 @@ static tbt_info tbtapps[] =
 					"2. camera can detect face and “zoom in” and “zoom out” is performed automatically",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {0, 3}
+			.features_required = {FEATURE_CAMERA, FEATURE_CAMERA_FRONT}
 		},
 	#endif
 
@@ -100,7 +100,7 @@ static tbt_info tbtapps[] =
 					"2. Check the captured picture which is shown automatically.",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {0, 3}
+			.features_required = {FEATURE_CAMERA}
 			},
 	#endif
 #endif
@@ -154,7 +154,7 @@ static tbt_info tbtapps[] =
 			.info = "Shows GPS coordinate data",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {11}
+			.features_required = {FEATURE_LOCATION_GPS}
 		},
 	#endif
 #endif
@@ -184,8 +184,8 @@ static tbt_info tbtapps[] =
 						"15. Press <b>Notify</b> button at Gatt Server end, changed value will be shown in Gatt Client end.<br/>"
 						"16. Press Disconnect button to Disconnect from Server.<br/>",
 				.result = 0,
-				.required_features_count = 1,
-				.features_required = {16}
+				.required_features_count = 2,
+				.features_required = {FEATURE_NETWORK_BLUETOOTH, FEATURE_NETWORK_BLUETOOTH_LE}
 			},
 	#endif
 	#ifdef TBT_MODULE_BLE_GATT_SERVER
@@ -198,8 +198,8 @@ static tbt_info tbtapps[] =
 				.info = "1. Press <b>Start Server</b> button to Start Gatt Server.<br/>"
 						"2. Follow the Steps in Gatt Client module.<br/>",
 				.result = 0,
-				.required_features_count = 1,
-				.features_required = {16}
+				.required_features_count = 2,
+				.features_required = {FEATURE_NETWORK_BLUETOOTH, FEATURE_NETWORK_BLUETOOTH_LE}
 			},
 	#endif
 #endif
@@ -221,7 +221,7 @@ static tbt_info tbtapps[] =
 					"6. Press <b>Confirm</b> to make pair <br/>",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -237,7 +237,7 @@ static tbt_info tbtapps[] =
 			.info = "Pair with bluetooth server and then cancel it.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -256,7 +256,7 @@ static tbt_info tbtapps[] =
 					"5. A connection popup will be shown, press <b>OK</b>",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -274,7 +274,7 @@ static tbt_info tbtapps[] =
 					"4.	When client is trying to send a file press <b>Accept/Reject</b> button to accept/reject file sending request.",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {16,73}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH,FEATURE_NETWORK_BLUETOOTH_OPP}
 		},
 	#endif
 
@@ -295,7 +295,7 @@ static tbt_info tbtapps[] =
 			.result = 0,
 			.file_name = "images/giraffe_800_1179.jpg",
 			.required_features_count = 2,
-			.features_required = {16,73}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH,FEATURE_NETWORK_BLUETOOTH_OPP}
 		},
 	#endif
 
@@ -315,7 +315,7 @@ static tbt_info tbtapps[] =
 					"5.	Now make a call and test if sound is heard in the audio device",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {16, 69}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH, FEATURE_NETWORK_BLUETOOTH_AUDIO_CALL}
 
 		},
 	#endif
@@ -336,7 +336,7 @@ static tbt_info tbtapps[] =
 					"5.	Now you can hear the key pressing sound in Headset.",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {16, 67}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH, FEATURE_NETWORK_BLUETOOTH_AUDIO_MEDIA}
 
 		},
 	#endif
@@ -355,7 +355,7 @@ static tbt_info tbtapps[] =
 					"4. Press <b>Authorize</b> button and the desired device will be Authorized.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -374,7 +374,7 @@ static tbt_info tbtapps[] =
 			.file_name = "sounds/SampleMP3.mp3",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -392,7 +392,7 @@ static tbt_info tbtapps[] =
 					"4.	After paring is completed press <b>Connected Services</b>, Bluetooth services will be shown in a list.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -411,7 +411,7 @@ static tbt_info tbtapps[] =
 					"5. check the data is sent to <b>Server Socket</b> end",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -429,7 +429,7 @@ static tbt_info tbtapps[] =
 					"4. <b>Hello this is TBT</b> message will be shown",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -451,10 +451,33 @@ static tbt_info tbtapps[] =
 					"8. Input from keyboard will be shown.",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {16,72},
+			.features_required = {FEATURE_NETWORK_BLUETOOTH,FEATURE_NETWORK_BLUETOOTH_HID},
 		},
 	#endif
 
+#ifdef TBT_MODULE_APP_BT_HID_DEVICE
+
+	// Bluetooh HID connect
+	{
+		.name = "HID Device",
+		.parent = "Bluetooth",
+		.apptype = TBT_APP_BT_HID_DEVICE,
+		.icon_name = "dummy",
+		.info = "1.	If Bluetooth is off, turn on manually.<br/>"
+				"2.	Press <b>Discover</b> to see the list of Bluetooth HID devices.<br/>"
+				"3.	Select the desired device from the list and device will be paired.<br/>"
+				"4. Press <b>Connect HID</b> button.<br/>"
+				"5.	If you are trying to connect a keyboard a pop-up will appear, press the same code on the keyboard and press enter.<br/>"
+				"6. <b>HID connected</b> will be written on the label, just above the device list<br/>"
+				"7. Go to Default <b>Messaging Application</b> and try to write message from the HID keyboard.<br/>"
+				"8. Input from keyboard will be shown.",
+		.result = 0,
+		.required_features_count = 2,
+		.features_required = {FEATURE_NETWORK_BLUETOOTH, FEATURE_NETWORK_BLUETOOTH_HID_DEVICE}
+	},
+#endif
+
+
 	#ifdef TBT_MODULE_APP_BT_AVRCP
 
 		// Bluetooh avrcp
@@ -466,7 +489,7 @@ static tbt_info tbtapps[] =
 			.info = "Connect with AVRCP device",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16},
+			.features_required = {FEATURE_NETWORK_BLUETOOTH},
 		},
 	#endif
 
@@ -482,7 +505,7 @@ static tbt_info tbtapps[] =
 			.info = "Connect using AG profile",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16},
+			.features_required = {FEATURE_NETWORK_BLUETOOTH},
 		},
 	#endif
 
@@ -500,7 +523,7 @@ static tbt_info tbtapps[] =
 					"5. Press <b>Get Data</b> and received data will be shown",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {16, 85}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH, FEATURE_NETWORK_BLUETOOTH_HEALTH}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_BT_PBAP_ALL_VCARDS
@@ -513,8 +536,8 @@ static tbt_info tbtapps[] =
 			.icon_name = "dummy",
 			.info = "Get All Phonebook vcards from PBAP Server",
 			.result = 0,
-			.required_features_count = 2,
-			.features_required = {16, 67}
+			.required_features_count = 1,
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 
 		},
 	#endif
@@ -533,7 +556,7 @@ static tbt_info tbtapps[] =
 			.info = "oob device",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -548,7 +571,7 @@ static tbt_info tbtapps[] =
 			.info = "oob device",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 #endif
@@ -571,7 +594,7 @@ static tbt_info tbtapps[] =
 					"2. Correct Error Message Displayed<br/>",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -591,7 +614,7 @@ static tbt_info tbtapps[] =
 					"2. Correct Error Message Displayed",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -611,7 +634,7 @@ static tbt_info tbtapps[] =
 					"2. Correct Error Message Displayed",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -631,7 +654,7 @@ static tbt_info tbtapps[] =
 					"2. Correct Error Message Displayed",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -651,7 +674,7 @@ static tbt_info tbtapps[] =
 					"2. Correct Error Message Displayed",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 
@@ -666,7 +689,7 @@ static tbt_info tbtapps[] =
 			.info = "Correct Error Message Displayed<br/>",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 #endif
@@ -684,7 +707,7 @@ static tbt_info tbtapps[] =
 					"2. Press <b>Wifi Off</b> to disable Wifi",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {24}
+			.features_required = {FEATURE_NETWORK_WIFI}
 		},
 	#endif
 #endif
@@ -694,14 +717,14 @@ static tbt_info tbtapps[] =
 
 		// Wifi Direct Test
 		{
-			.name = "Wifi Direct ",
+			.name = "Wifi Direct",
 			.parent = "Wifi Direct",
 			.apptype = TBT_APP_WIFIDIRECT,
 			.icon_name = "dummy",
 			.info = "Connect to a WIFI DIRECT<br/> device",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {24, 25}
+			.features_required = {FEATURE_NETWORK_WIFI, FEATURE_NETWORK_WIFI_DIRECT}
 		},
 	#endif
 
@@ -716,7 +739,7 @@ static tbt_info tbtapps[] =
 			.info = "Initiate connection to a WIFI DIRECT<br/> device and then cancel the connection.",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {24, 25}
+			.features_required = {FEATURE_NETWORK_WIFI, FEATURE_NETWORK_WIFI_DIRECT}
 		},
 	#endif
 #endif
@@ -738,7 +761,7 @@ static tbt_info tbtapps[] =
 					"5. If device is removed from tag then <b>Device Detached</b> will be shown",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {17,77}
+			.features_required = {FEATURE_NETWORK_NFC,FEATURE_NETWORK_NFC_TAG}
 		},
 	#endif
 
@@ -757,7 +780,7 @@ static tbt_info tbtapps[] =
 					"4.	If you detach devices it'll show Device Detached",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {17,76}
+			.features_required = {FEATURE_NETWORK_NFC,FEATURE_NETWORK_NFC_P2P}
 		},
 	#endif
 
@@ -773,7 +796,7 @@ static tbt_info tbtapps[] =
 			.info = "Test NFC HCE Preferred card emulation",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {17,81}
+			.features_required = {FEATURE_NETWORK_NFC,FEATURE_NETWORK_NFC_CARD_EMULATION_HCE}
 		},
 	#endif
 		#ifdef TBT_MODULE_APP_NFC_ESE
@@ -786,7 +809,7 @@ static tbt_info tbtapps[] =
 			.info = "Test NFC HCE ESE card emulation",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {17,81}
+			.features_required = {FEATURE_NETWORK_NFC,FEATURE_NETWORK_NFC_CARD_EMULATION}
 		},
 	#endif
 #endif
@@ -799,7 +822,9 @@ static tbt_info tbtapps[] =
 			.apptype = TBT_APP_SMARTCARD,
 			.icon_name = "dummy",
 			.info = "Smartcard signed <br/> unsigned app check",
-			.result = 0
+			.result = 0,
+			.required_features_count = 2,
+			.features_required = {FEATURE_NETWORK_NFC,FEATURE_NETWORK_NFC_CARD_EMULATION}
 		},
 	#endif
 #endif
@@ -1234,7 +1259,7 @@ static tbt_info tbtapps[] =
 			.sensor_response_interval = 20,
 			.axes = { -1, 1, 1 },
 			.required_features_count = 1,
-			.features_required = {42}
+			.features_required = {FEATURE_SENSOR_ACCELEROMETER}
 
 		},
 	#endif
@@ -1259,7 +1284,7 @@ static tbt_info tbtapps[] =
 			.sensor_response_interval = 20,
 			.axes = { -1, 1, 1 },
 			.required_features_count = 1,
-			.features_required = {44}
+			.features_required = {FEATURE_SENSOR_GYROSCOPE}
 
 		},
 	#endif
@@ -1283,7 +1308,7 @@ static tbt_info tbtapps[] =
 
 			.units = SENSOR_UNIT_MAX,
 			.required_features_count = 1,
-			.features_required = {48}
+			.features_required = {FEATURE_SENSOR_PROXIMITY}
 
 		},
 	#endif
@@ -1306,7 +1331,7 @@ static tbt_info tbtapps[] =
 			.sensortype = SENSOR_LIGHT,
 			.units = SENSOR_UNIT_LUX,
 			.required_features_count = 1,
-			.features_required = {78}
+			.features_required = {FEATURE_SENSOR_PHOTOMETER}
 		},
 	#endif
 
@@ -1325,7 +1350,7 @@ static tbt_info tbtapps[] =
 			.sensortype = SENSOR_ULTRAVIOLET,
 			.units = SENSOR_UNIT_MAX,
 			.required_features_count = 1,
-			.features_required = {79}
+			.features_required = {FEATURE_SENSOR_ULTRAVIOLET}
 		},
 	#endif
 
@@ -1346,7 +1371,7 @@ static tbt_info tbtapps[] =
 			.extra_file_name = "images/arrow_.png",
 			.units = SENSOR_UNIT_HECTOPASCAL,
 			.required_features_count = 1,
-			.features_required = {86}
+			.features_required = {FEATURE_SENSOR_BAROMETER}
 
 
 		},
@@ -1372,7 +1397,7 @@ static tbt_info tbtapps[] =
 			.sensortype = SENSOR_MAGNETIC,
 			.units = SENSOR_UNIT_MICRO_TESLA,
 			.required_features_count = 1,
-			.features_required = {46}
+			.features_required = {FEATURE_SENSOR_MAGNETOMETER}
 		},
 	#endif
 #endif
@@ -1691,7 +1716,7 @@ static tbt_info tbtapps[] =
 		// Shortcut
 		{
 			.name = "Shortcut",
-			.parent = "EFL/Event",
+			.parent = "Shortcut",
 			.apptype = TBT_APP_SHORTCUT,
 			.icon_name = "dummy",
 			.info = "1. Press <b>Add Shortcut</b> button.<br/>"
@@ -1741,7 +1766,7 @@ static tbt_info tbtapps[] =
 					"8.	Press button Disconnect to <b>Disconnect</b> Push Service",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {19}
+			.features_required = {FEATURE_NETWORK_PUSH}
 		},
 	#endif
 #endif
@@ -1799,7 +1824,7 @@ static tbt_info tbtapps[] =
 			.info = "View Audio Jack <br/>Insert Info",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {11}
+			.features_required = {FEATURE_LOCATION_GPS}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_USB_CONNECTED
@@ -1825,7 +1850,7 @@ static tbt_info tbtapps[] =
 			.info = "View Audio Jack <br/>Insert Info",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {16}
+			.features_required = {FEATURE_NETWORK_BLUETOOTH}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_AUTO_ROTATION_ENABLED
@@ -1839,7 +1864,7 @@ static tbt_info tbtapps[] =
 			.info = "View Audio Jack <br/>Insert Info",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {41}
+			.features_required = {FEATURE_SCREEN_AUTO_ROTATION}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_LOCATION_SERVICE_ENABLED
@@ -1853,7 +1878,7 @@ static tbt_info tbtapps[] =
 			.info = "View Audio Jack <br/>Insert Info",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {10}
+			.features_required = {FEATURE_LOCATION}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_WIFI_HOTSPOT_ENABLED
@@ -1867,7 +1892,7 @@ static tbt_info tbtapps[] =
 			.info = "View Audio Jack <br/>Insert Info",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {24}
+			.features_required = {FEATURE_NETWORK_WIFI}
 		},
 	#endif
 #endif
@@ -1884,7 +1909,7 @@ static tbt_info tbtapps[] =
 			.info = "Mirrors The Screen",
 			.result = 0,
 			.required_features_count = 4,
-			.features_required = {24,25, 87,88}
+			.features_required = {FEATURE_NETWORK_WIFI,FEATURE_NETWORK_WIFI_DIRECT, FEATURE_NETWORK_WIFI_DIRECT_DISPLAY, FEATURE_NETWORK_INTERNET}
 		},
 	#endif
 #endif
@@ -1952,7 +1977,7 @@ static tbt_info tbtapps[] =
 			.info = "Check NSD DNS-SD <br/>",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {83}
+			.features_required = {FEATURE_NETWORK_SERVICE_DISCOVERY_DNSSD}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_NSD_DNS_SD_REMOTE
@@ -1966,7 +1991,7 @@ static tbt_info tbtapps[] =
 			.info = "Check NSD DNS-SD <br/>",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {83}
+			.features_required = {FEATURE_NETWORK_SERVICE_DISCOVERY_DNSSD}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_NSD_SSDP_LOCAL
@@ -1982,7 +2007,7 @@ static tbt_info tbtapps[] =
 					"5.	Press <b>Browse Service</b> button. Then, corresponding service and text value in DNS-SD Remote will be seen in top list.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {84}
+			.features_required = {FEATURE_NETWORK_SERVICE_DISCOVERY_SSDP}
 		},
 	#endif
 
@@ -1997,7 +2022,7 @@ static tbt_info tbtapps[] =
 					"3.	Press <b>Add Record</b> button. Then, “local service registered” will be seen in bottom list and in top list added text with key value pair will be seen.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {84}
+			.features_required = {FEATURE_NETWORK_SERVICE_DISCOVERY_SSDP}
 		},
 	#endif
 #endif
@@ -2027,7 +2052,7 @@ static tbt_info tbtapps[] =
 			.info = "Check Earphone",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {6}
+			.features_required = {FEATURE_FMRADIO}
 		},
 	#endif
 #endif
@@ -2057,7 +2082,7 @@ static tbt_info tbtapps[] =
 			.info = "Insert Audio jack and change sound profile to Sound",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {13}
+			.features_required = {FEATURE_MICROPHONE}
 		},
 	#endif
 #endif
@@ -2103,7 +2128,7 @@ static tbt_info tbtapps[] =
 			.info = "Notification is updated",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {80}
+			.features_required = {FEATURE_NOTIFICATION}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_NOTIFICATION_TIME
@@ -2117,7 +2142,7 @@ static tbt_info tbtapps[] =
 			.info = "Notification is updated",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {80}
+			.features_required = {FEATURE_NOTIFICATION}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_NOTIFICATION_TITLE
@@ -2131,7 +2156,7 @@ static tbt_info tbtapps[] =
 			.info = "Notification is updated",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {80}
+			.features_required = {FEATURE_NOTIFICATION}
 		},
 	#endif
 	#ifdef TBT_MODULE_APP_NOTIFICATION_IMAGE
@@ -2145,7 +2170,7 @@ static tbt_info tbtapps[] =
 			.info = "Notification is updated",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = {80}
+			.features_required = {FEATURE_NOTIFICATION}
 		},
 	#endif
 #endif
@@ -2163,7 +2188,7 @@ static tbt_info tbtapps[] =
 					"3.You will see updated connection status<br/>",
 			.result = 0,
 			.required_features_count = 2,
-			.features_required = {24,21}
+			.features_required = {FEATURE_NETWORK_WIFI, FEATURE_NETWORK_TELEPHONY}
 		},
 	#endif
 #endif
@@ -2306,7 +2331,7 @@ static tbt_info tbtapps[] =
 					"4. Delete the contact Test.",
 			.result = 0,
 			.required_features_count = 1,
-			.features_required = { 21 }
+			.features_required = { FEATURE_NETWORK_TELEPHONY }
 		},
 	#endif
 #endif
@@ -2513,24 +2538,8 @@ static tbt_info tbtapps[] =
 			.icon_name = "dummy",
 			.info = "DALi TTS Functionality",
 			.result = 0,
-			.required_features_count = 1,
-			.features_required = {11}
-		},
-	#endif
-//	#ifdef TBT_MODULE_APP_DALI_SCROLL_BAR
-//
-//		//DALi Test
-//		{
-//			.name = "DALi Scroll Bar",
-//			.parent = "DALi",
-//			.apptype = TBT_APP_DALI_SCROLL_BAR,
-//			.icon_name = "dummy",
-//			.info = "DALi Scroll Bar Functionality",
-//			.result = 0,
-//			.required_features_count = 1,
-//			.features_required = {11}
-//		},
-//	#endif
+		},
+	#endif
 	#ifdef TBT_MODULE_APP_DALI_SCROLL
 
 		//DALi Test
@@ -2541,8 +2550,6 @@ static tbt_info tbtapps[] =
 			.icon_name = "dummy",
 			.info = "DALi Scroll Functionality",
 			.result = 0,
-			.required_features_count = 1,
-			.features_required = {11}
 		}
 	#endif
 #endif
diff --git a/tbtcoreapp/src/view/tbt-d2d-view.c b/tbtcoreapp/src/view/tbt-d2d-view.c
index abf9315..0374d8d 100644
--- a/tbtcoreapp/src/view/tbt-d2d-view.c
+++ b/tbtcoreapp/src/view/tbt-d2d-view.c
@@ -15,12 +15,10 @@
  *******************************************************************************/
 /**
  * @file	tbt-d2d-view.c
- * @brief	covers locationn retrieval
- *			starts location service using d2d method and continuously updates the current location
+ * @brief	covers d2d convergence apis
  *
- * @author	golam kayes(g.kayes@samsung.com) and salman rahman(salman.ran)
- * @date	October, 2014
- * @bug		location manager does not start in device
+ * @author	A. B. M. Nazibullah(nazib.ullah@samsung.com)
+ * @date	October, 2016
  * @credit
  *
  */
@@ -43,9 +41,6 @@ struct _d2d_view
 	Evas_Object *server_list;
 	Evas_Object *client_msg_list;
 	conv_h gl_conv_h;
-	conv_service_h service_handle;
-	conv_channel_h channel_handle;
-	conv_payload_h payld_handle;
 	conv_device_h selected_device;
 };
 
@@ -57,18 +52,13 @@ typedef struct _service_data{
 static Evas_Object *found_device_list;
 static Evas_Object *service_list;
 static Evas_Object *app_comm_menu_list;
-static bool is_app_control_tested;
 
 
 static void _app_destroy_cb(void* this);
-static void _conv_service_listener_cb(conv_service_h service_handle, conv_channel_h channel_handle, conv_error_e error, conv_payload_h payload, void* user_data);
-static void make_service(d2d_view *this);
 static void discovery_cb(conv_device_h device, int result, void* user_data);
-static int app_communication_menu(conv_service_h service_handle, void* data);
 static void device_selected_cb(void *data, Evas_Object *obj, void *event_info);
 static void message_listener(conv_service_h handle, conv_channel_h channel, int error, conv_payload_h result, void* user_data);
 static void start_discovery_cb(void *data, Evas_Object *obj, void *event_info);
-static void _conv_service_connected_cb(conv_service_h service_handle, conv_error_e error, conv_payload_h result, void* user_data);
 
 /**
  * @function		d2d_view_add
@@ -83,7 +73,6 @@ d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *i
 	RETVM_IF(NULL == tbt_info, NULL, "tbt_info is null");
     RETVM_IF(NULL == item, NULL, "item is NULL");
 
-    is_app_control_tested = false;
 
     d2d_view *this = NULL;
     this = calloc(1, sizeof(d2d_view));
@@ -123,7 +112,6 @@ d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *i
     }
     else  if (tbt_info->apptype == TBT_APP_D2D_SERVER)
     {
-    	make_service(this);
     	this->client_msg_list = elm_list_add(this->view->layout);
     	elm_list_mode_set(this->client_msg_list, ELM_LIST_COMPRESS);
     	elm_list_item_append(this->client_msg_list, "Ready", NULL, NULL, NULL, NULL);
@@ -137,12 +125,6 @@ d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *i
 }
 
 
-static void _conv_service_connected_cb(conv_service_h service_handle, conv_error_e error, conv_payload_h result, void* user_data)
-{
-	DBG("_conv_service_connected_cb");
-}
-
-
 /**
  * @function		get_d2d_error
  * @since_tizen		3.0
@@ -195,7 +177,9 @@ static int app_control_start(conv_service_h service_handle, void* data)
 	service_data *s_data = (service_data*) data;
 	s_data->service_handle = service_handle;
 	ret = conv_service_set_listener_cb(service_handle, message_listener, (void*)s_data);
-	DBG("conv_service_set_listener_cb failed with error : %s", get_d2d_error(ret));
+	RETVM_IF(ret != CONV_ERROR_NONE,0,"conv_service_set_listener_cb failed with error : %s", get_d2d_error(ret));
+	ret = conv_service_read(service_handle, NULL, NULL);
+	RETVM_IF(ret != CONV_ERROR_NONE,0,"conv_service_read failed with error : %s", get_d2d_error(ret));
 	ret = conv_service_start(service_handle, NULL, NULL);
 	RETVM_IF(ret != CONV_ERROR_NONE,0, "conv_service_start failed with error : %s", get_d2d_error(ret));
 
@@ -210,9 +194,7 @@ static void service_selected_cb(void *data, Evas_Object *obj, void *event_info)
 
 	RETM_IF(NULL==s_data, "s_data is NULL");
 
-	conv_service_e e = 0;
-	d2d_view* this = s_data->view;
-
+	conv_service_e e = CONV_SERVICE_NONE;
 
 	if(s_data->service_handle == NULL)
 	{
@@ -221,6 +203,7 @@ static void service_selected_cb(void *data, Evas_Object *obj, void *event_info)
 
 	conv_service_h service_handle =s_data->service_handle;
 
+
 	int ret = conv_service_get_type(service_handle, &e);
 	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_type failed with error : %s", get_d2d_error(ret));
 
@@ -228,8 +211,6 @@ static void service_selected_cb(void *data, Evas_Object *obj, void *event_info)
 	{
 	case CONV_SERVICE_APP_TO_APP_COMMUNICATION :
 		DBG("CONV_SERVICE_APP_TO_APP_COMMUNICATION");
-		ret = app_communication_menu(service_handle, this);
-		RETM_IF(ret != CONV_ERROR_NONE, "app_communication_menu failed with error : %s", get_d2d_error(ret));
 		break;
 
 	case CONV_SERVICE_REMOTE_APP_CONTROL :
@@ -242,118 +223,25 @@ static void service_selected_cb(void *data, Evas_Object *obj, void *event_info)
 		break;
 
 	default :
-		DBG( "DTOD_TEST default");
+		DBG( "UNKNOWN_SERVICE");
 		break;
 	}
 
 }
 
-
-
-static void publish_cb(void *data, Evas_Object *obj, void *event_info)
-{
-
-	DBG("publish_cb");
-
-	conv_service_h service_handle = (conv_service_h)data;
-	conv_channel_h channel_handle;
-	conv_payload_h payload_handle;
-
-	int ret = conv_channel_create(&channel_handle);
-	DBG("conv_channel_create : %s", get_d2d_error(ret));
-	ret = conv_channel_set_string(channel_handle, "uri", "org.tizen.tbtcoreapp");
-	DBG("conv_channel_set_string : %s", get_d2d_error(ret));
-	ret = conv_channel_set_string(channel_handle, "channel_id", "tbtcoreapp");
-	DBG("conv_channel_set_string : %s", get_d2d_error(ret));
-	ret = conv_payload_create(&payload_handle);
-	DBG("conv_payload_create : %s", get_d2d_error(ret));
-	ret = conv_payload_set_string(payload_handle, "payload_type", "GoodNews");
-	DBG("conv_payload_set_string : %s", get_d2d_error(ret));
-	ret = conv_service_publish(service_handle, channel_handle, payload_handle);
-	DBG("conv_service_publish : %s", get_d2d_error(ret));
-	ret = conv_service_read(service_handle, channel_handle, payload_handle);
-	DBG("conv_service_read : %s", get_d2d_error(ret));
-
-	sleep(3);
-
-	ret = conv_service_stop(service_handle, NULL, NULL);
-	DBG("conv_service_stop : %s", get_d2d_error(ret));
-
-	DBG("conv_payload_destroy called..\n");
-	ret = conv_payload_destroy(payload_handle);
-	DBG("conv_payload_destroy : %s", get_d2d_error(ret));
-}
-
-static void read_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	conv_service_h service_handle = (conv_service_h)data;
-	conv_channel_h channel_handle;
-	conv_payload_h payload_handle;
-
-	int ret = conv_channel_create(&channel_handle);
-	ret = conv_channel_set_string(channel_handle, "uri", "org.tizen.tbtcoreapp");
-	ret = conv_channel_set_string(channel_handle, "channel_id", "tbtcoreapp");
-	ret = conv_payload_create(&payload_handle);
-
-	//To-do: implementation for "Read" API
-//	ret = conv_service_read(service_handle, channel_handle, payload_handle);
-//	DBG("conv_service_read : %s", get_d2d_error(ret));
-}
-
-static void app_launch_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	DBG("app_launch_cb");
-
-	conv_service_h service_handle = (conv_service_h)data;
-	conv_channel_h channel_handle;
-	conv_payload_h payload_handle;
-	int ret;
-
-	ret = conv_channel_create(&channel_handle);
-	DBG("conv_channel_create : %s", get_d2d_error(ret));
-	ret = conv_channel_create(&channel_handle);
-	DBG("conv_channel_create : %s", get_d2d_error(ret));
-	ret = conv_channel_set_string(channel_handle, "uri", "org.tizen.tbtcoreapp");
-	DBG("conv_channel_set_string : %s", get_d2d_error(ret));
-	ret = conv_channel_set_string(channel_handle, "channel_id", "tbtcoreapp");
-	DBG("conv_channel_set_string : %s", get_d2d_error(ret));
-	ret = conv_payload_create(&payload_handle);
-	DBG("conv_payload_create : %s", get_d2d_error(ret));
-
-	//To-do: implementation for service_start API with app launch
-
-}
-
-
 static void message_listener(conv_service_h handle, conv_channel_h channel, int error, conv_payload_h result, void* user_data)
 {
 	DBG("message_listener");
 
 	char* test;
 	service_data* s_data = (service_data*) user_data;
-	d2d_view* this = (d2d_view*)s_data->view;
-	conv_service_h listner_handle = (conv_service_h)s_data->service_handle;
 	conv_payload_get_string(result, "result_type", &test);
 	int ret;
 
 	DBG("result_type : %s", test);
 
-	if (!strcmp(test, "onConnect"))
-	{
-		DBG("==== Connected ====");
-//		elm_list_item_append(app_comm_menu_list, "App Launch", NULL, NULL, app_launch_cb, listner_handle);
-//		elm_list_item_append(app_comm_menu_list, "Read", NULL, NULL, read_cb, listner_handle);
-
-		elm_list_item_append(app_comm_menu_list, "Publish", NULL, NULL, publish_cb, listner_handle);
-		elm_list_go(app_comm_menu_list);
-		elm_object_part_content_set(this->view->layout, "list_container", app_comm_menu_list);
-	}
-
-
 	if (!strcmp(test, "onStart"))
 	{
-		DBG("==== ON-START ====");
-		is_app_control_tested = true;
 		conv_payload_h payload_handle;
 
 		ret = conv_payload_create(&payload_handle);
@@ -375,63 +263,24 @@ static void message_listener(conv_service_h handle, conv_channel_h channel, int
 		ret = conv_service_stop(s_data->service_handle, NULL, NULL);
 		RETM_IF(ret != CONV_ERROR_NONE, "conv_service_stop failed with error : %s", get_d2d_error(ret));
 
-		DBG("conv_payload_destroy called..\n");
+		DBG("conv_payload_destroy called..");
 		ret = conv_payload_destroy(payload_handle);
 		RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_destroy failed with error : %s", get_d2d_error(ret));
 
-	}
-
-	//
+		ret = conv_service_destroy(s_data->service_handle);
+		RETM_IF(ret != CONV_ERROR_NONE, "conv_service_destroy failed with error : %s", get_d2d_error(ret));
 
-}
-
-static int app_communication_menu(conv_service_h service_handle, void* data)
-{
-	conv_channel_h channel_handle;
-	d2d_view* this = (d2d_view*) data;
-
-	DBG( "app_communication_start");
-
-	if(!is_app_control_tested)
-	{
-		DBG("Test app-control first");
-		Evas_Object* popup = ui_utils_popup_add(this->view->layout, "Test app-control first");
-		evas_object_show(popup);
-		return 0;
 	}
 
-	int ret = conv_channel_create(&channel_handle);
-	RETVM_IF(ret != CONV_ERROR_NONE, ret, "conv_channel_create failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_channel_set_string(channel_handle, "uri", "org.tizen.tbtcoreapp");
-	RETVM_IF(ret != CONV_ERROR_NONE, ret, "conv_channel_set_string failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_channel_set_string(channel_handle, "channel_id", "tbtcoreapp");
-	RETVM_IF(ret != CONV_ERROR_NONE, ret, "conv_channel_set_string failed with error : %s", get_d2d_error(ret));
-
-	service_data* s_data = (service_data*)malloc(sizeof(service_data));
-	s_data->view = this;
-	s_data->service_handle = service_handle;
-
-	ret = conv_service_set_listener_cb(service_handle, message_listener, s_data);
-	RETVM_IF(ret != CONV_ERROR_NONE, ret, "conv_service_set_listener_cb failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_service_connect(service_handle, _conv_service_connected_cb, this);
-	DBG( "conv_service_connect: %s", get_d2d_error(ret));
-
-	ret = conv_service_start(service_handle, channel_handle, NULL);
-	RETVM_IF(ret != CONV_ERROR_NONE, ret, "conv_service_start failed with error : %s", get_d2d_error(ret));
-
-	DBG( "app_communication_end");
-	return 0;
 }
 
+
 static void service_foreach_cb(conv_service_h service_handle, void *user_data)
 {
 	conv_service_e e;
 	d2d_view* this = (d2d_view*) user_data;
 
-	DBG( "Service----------------------------\n");
+	DBG( "service_foreach_cb");
 	service_data* s_data = (service_data*)malloc(sizeof(service_data));
 	s_data->view = this;
 
@@ -463,9 +312,6 @@ static void service_foreach_cb(conv_service_h service_handle, void *user_data)
 	elm_list_go(service_list);
 	elm_object_part_content_set(this->view->layout, "list_container", service_list);
 
-	conv_channel_h channel_h;
-	ret = conv_channel_create(&channel_h);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_channel_create failed with error : %s", get_d2d_error(ret));
 }
 
 static void device_selected_cb(void *data, Evas_Object *obj, void *event_info)
@@ -490,15 +336,15 @@ static void discovery_cb(conv_device_h device, int result, void* user_data)
 	d2d_view* this = (d2d_view*) user_data;
 	DBG("Inside server discovery cb.");
 	int ret = conv_device_get_property_string(device, CONV_DEVICE_ID, &value);
-	//RETM_IF(ret != CONV_ERROR_NONE, "conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
+	DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
 	DBG("device id = %s", value);
 
 	ret = conv_device_get_property_string(device, CONV_DEVICE_NAME, &device_name);
-	//RETM_IF(ret != CONV_ERROR_NONE, "conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
+	DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
 	DBG("device name = %s", device_name);
 
     ret = conv_device_get_property_string(device, CONV_DEVICE_TYPE, &value);
-	//RETM_IF(ret != CONV_ERROR_NONE, "conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
+	DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
 	DBG( "device TYPE = %s", value);
 
 	this->selected_device = device;
@@ -510,74 +356,8 @@ static void discovery_cb(conv_device_h device, int result, void* user_data)
 		elm_object_part_content_set(this->view->layout, "list_container", found_device_list);
 
 	}
-	//DBG("Device----------------------------");
 }
 
-static void make_service(d2d_view *this)
-{
-	int ret = conv_service_create(&this->service_handle);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_create failed with error : %s", get_d2d_error(ret));
-
-    ret = conv_channel_create(&this->channel_handle);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_channel_create failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_channel_set_string(this->channel_handle, "uri", "org.tizen.tbtcoreapp");
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_channel_set_string failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_channel_set_string(this->channel_handle, "channel_id", "tbtcoreapp");
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_channel_set_string failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_payload_create(&this->payld_handle);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_create failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_service_set_type(this->service_handle, CONV_SERVICE_APP_TO_APP_COMMUNICATION);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_set_type failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_service_set_property_string(this->service_handle, CONV_SERVICE_ID, "test_app");
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_set_property_string failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_service_set_property_string(this->service_handle, CONV_SERVICE_VERSION, "1.0");
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_set_property_string failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_service_set_listener_cb(this->service_handle, _conv_service_listener_cb, (void *)this);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_set_listener_cb failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_service_start(this->service_handle, this->channel_handle, this->payld_handle);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_start failed with error : %s", get_d2d_error(ret));
-}
-
-
-static void _conv_service_listener_cb(conv_service_h service_handle, conv_channel_h channel_handle, conv_error_e error, conv_payload_h payload, void* user_data)
-{
-	char* test;
-	char* payload_type;
-
-	d2d_view* this  = (d2d_view*) user_data;
-
-	DBG("callback for service..");
-	conv_payload_get_string(payload, "result_type", &test);
-
-	DBG( "result type : %s", test);
-
-	if (!strcmp(test, "onClientConnect"))
-	{
-		elm_list_item_append(this->client_msg_list, "Client Connected", NULL, NULL, NULL, NULL);
-		elm_list_go(this->client_msg_list);
-	}
-	if (!strcmp(test, "onMessage"))
-	{
-			int ret = conv_payload_get_string(payload, "payload_type", &payload_type);
-			RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_get_string failed with error: %s", get_d2d_error(ret));
-
-			strcat(payload_type, " Received");
-			elm_list_item_append(this->client_msg_list, payload_type, NULL, NULL, NULL, NULL);
-			elm_list_go(this->client_msg_list);
-
-			DBG("payload_type : %s", payload_type);
-			DBG( "==== Received ====");
-
-	}
-}
 
 /**
  * @function		_app_destroy_cb