Revert "Keep LE oob data to reduce NFC OOB pairing failure"

This reverts commit 6cdddea69bc871badb6c9aa39681af95b3e63fa3.

Change-Id: I6bed80e4741502e654cebab4d233924fea9412cf

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
index 4941534..83ca1d2 100644 (file)
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
@@ -51,7 +51,6 @@
 #include "bt-service-hiddevice.h"
 #include "bt-service-socket.h"
 #include "bt-service-hdp.h"
-#include "bt-service-oob.h"
 
 /* OAL headers */
 #include <oal-event.h>
@@ -1341,7 +1340,6 @@ static void __bt_phone_name_changed_cb(keynode_t *node, void *data)
 static gboolean __bt_adapter_post_set_enabled(gpointer user_data)
 {
        int result = BLUETOOTH_ERROR_NONE;
-       bt_oob_data_t local_oob_data;
 
        BT_INFO("__bt_adapter_post_set_enabled>>");
 
@@ -1366,10 +1364,6 @@ static gboolean __bt_adapter_post_set_enabled(gpointer user_data)
 
        __bt_adapter_state_set_status(BT_ACTIVATED);
 
-       result = _bt_le_oob_read_local_data(&local_oob_data);
-       if (result == BLUETOOTH_ERROR_NONE)
-               _bt_le_oob_set_local_cache_data(&local_oob_data);
-
        /*Send BT Enabled event to application */
        _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_ENABLED,
                        g_variant_new("(i)", result));

diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c
index 458da29..8fa62ae 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -2032,16 +2032,9 @@ int __bt_bluez_request(int function_name,
        }
        case BT_LE_OOB_READ_LOCAL_DATA: {
                bt_oob_data_t local_oob_data;
-               bt_oob_data_t *local_oob_cache_data;
 
-               local_oob_cache_data = _bt_le_oob_get_local_cache_data();
-               if (local_oob_cache_data && local_oob_cache_data->eir_len) {
-                       g_array_append_vals(*out_param1, local_oob_cache_data,
-                               sizeof(bt_oob_data_t));
-                       return BLUETOOTH_ERROR_NONE;
-               }
+               memset(&local_oob_data, 0x00, sizeof(bt_oob_data_t));
                result = _bt_le_oob_read_local_data(&local_oob_data);
-               _bt_le_oob_set_local_cache_data(&local_oob_data);
 
                g_array_append_vals(*out_param1, &local_oob_data,
                                sizeof(bt_oob_data_t));

diff --git a/bt-service-adaptation/services/obex/bt-service-oob.c b/bt-service-adaptation/services/obex/bt-service-oob.c
index 3f9f123..ca09467 100644 (file)
--- a/bt-service-adaptation/services/obex/bt-service-oob.c
+++ b/bt-service-adaptation/services/obex/bt-service-oob.c
@@ -31,8 +31,6 @@
 #include "bt-service-oob.h"
 #include "bt-service-event.h"
 
-static bt_oob_data_t local_le_oob_cache_data = {0, };
-
 static int __get_oob_data_from_variant(GVariant *variant,
                unsigned char *buf, int size)
 {
@@ -373,21 +371,3 @@ int _bt_le_oob_read_local_data(bt_oob_data_t *local_oob_data)
        return BLUETOOTH_ERROR_NONE;
 }
 
-void _bt_le_oob_reset_local_cache_data(void)
-{
-       memset(&local_le_oob_cache_data, 0x00, sizeof(bt_oob_data_t));
-}
-
-bt_oob_data_t *_bt_le_oob_get_local_cache_data(void)
-{
-       if (local_le_oob_cache_data.eir_len)
-               return &local_le_oob_cache_data;
-       else
-               return NULL;
-}
-
-void _bt_le_oob_set_local_cache_data(bt_oob_data_t *data)
-{
-       memcpy(&local_le_oob_cache_data, data, sizeof(bt_oob_data_t));
-}
-

diff --git a/bt-service-adaptation/services/obex/include/bt-service-oob.h b/bt-service-adaptation/services/obex/include/bt-service-oob.h
index 45fccb7..18c9c01 100644 (file)
--- a/bt-service-adaptation/services/obex/include/bt-service-oob.h
+++ b/bt-service-adaptation/services/obex/include/bt-service-oob.h
@@ -39,13 +39,6 @@ int _bt_oob_remove_remote_data(
 
 int _bt_le_oob_read_local_data(bt_oob_data_t *local_oob_data);
 
-void _bt_le_oob_reset_local_cache_data(void);
-
-bt_oob_data_t *_bt_le_oob_get_local_cache_data(void);
-
-void _bt_le_oob_set_local_cache_data(bt_oob_data_t *data);
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */