Revert "Fix UTC fail issue for tv profile" 10/88910/1 accepted/tizen/common/20160922.120619 accepted/tizen/ivi/20160922.233149 accepted/tizen/mobile/20160922.233127 accepted/tizen/tv/20160922.233142 accepted/tizen/wearable/20160922.233134 submit/tizen/20160922.015934
authorDoHyun Pyun <dh79.pyun@samsung.com>
Wed, 21 Sep 2016 05:41:32 +0000 (14:41 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Wed, 21 Sep 2016 05:41:43 +0000 (14:41 +0900)
This reverts commit 12aac29eb27cfd070ba1ebbaebb59b4f47edb442.

Change-Id: I7d7d8887ec8d1bca94caada5c1d21398bf514649
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
packaging/bluez.spec
src/adapter.c

index 550ca22..c6dff64 100644 (file)
@@ -104,10 +104,6 @@ export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__ -D__BROADCOM_PATCH__ -DBLUEZ5_27_GATT
 export CFLAGS="${CFLAGS} -D__BT_SCMST_FEATURE__ -DSUPPORT_SMS_ONLY -D__BROADCOM_QOS_PATCH__ -DTIZEN_WEARABLE"
 %endif
 
-%if "%{?profile}" == "tv"
-export CFLAGS="${CFLAGS} -DTIZEN_PROFILE_TV"
-%endif
-
 export LDFLAGS=" -lncurses -Wl,--as-needed "
 export CFLAGS+=" -DPBAP_SIM_ENABLE -DSUPPORT_AVRCP_TARGET"
 %reconfigure --disable-static \
index 0ac54cf..c18f6c2 100644 (file)
@@ -1911,25 +1911,17 @@ static void start_le_discovery_complete(uint8_t status, uint16_t length,
                                        const void *param, void *user_data)
 {
        struct btd_adapter *adapter = user_data;
-#ifndef TIZEN_PROFILE_TV
        const struct mgmt_cp_start_discovery *rp = param;
-#endif
 
        DBG("status 0x%02x", status);
-#ifndef TIZEN_PROFILE_TV
        DBG("Discovery Type 0x%02x", rp->type);
        if (length < sizeof(*rp)) {
                error("Wrong size of start discovery return parameters");
                return;
        }
-#else
-       status = MGMT_STATUS_SUCCESS;
-#endif
 
        if (status == MGMT_STATUS_SUCCESS) {
-#ifndef TIZEN_PROFILE_TV
                adapter->discovery_type |= rp->type;
-#endif
                adapter->discovery_enable = 0x01;
 
                if (adapter->le_discovering)