commit 51356020fb8fec90a01eeaa23faaf9d3cb0b6322
author Zhihai Xu <zhihaixu@google.com> Wed Apr 16 19:01:09 2014 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Wed Apr 16 19:01:09 2014 +0000
tree e335a34b5ed87b4c2d149ddad5fe767aa14db47f
parent 7fc4503f4957e0ab6f5b59640594a2d844336caa
parent b9238669b5ad298980d60540e8019c4b90a866b1

Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-wireless-dev

btif/src/btif_gatt_util.c

diff --git a/btif/src/btif_gatt_util.c b/btif/src/btif_gatt_util.c
index ab56f99..020323b 100644
--- a/btif/src/btif_gatt_util.c
+++ b/btif/src/btif_gatt_util.c
@@ -271,7 +271,7 @@
 
 static void btif_gatt_set_encryption_cb (BD_ADDR bd_addr, tBTA_STATUS result)
 {
-    if (result != BTA_SUCCESS)
+    if (result != BTA_SUCCESS && result != BTA_BUSY)
     {
         bt_bdaddr_t bda;
         bdcpy(bda.address, bd_addr);

stack/btm/btm_ble_addr.c

diff --git a/stack/btm/btm_ble_addr.c b/stack/btm/btm_ble_addr.c
index a3f6a7e..3c646e9 100644
--- a/stack/btm/btm_ble_addr.c
+++ b/stack/btm/btm_ble_addr.c
@@ -287,7 +287,7 @@
     {
         p_dev_rec = &btm_cb.sec_dev_rec[rec_index];
 
-        BTM_TRACE_ERROR2("sec_flags = %02x device_type = %d", p_dev_rec->sec_flags, p_dev_rec->device_type);
+        BTM_TRACE_DEBUG2("sec_flags = %02x device_type = %d", p_dev_rec->sec_flags, p_dev_rec->device_type);
 
         if ((p_dev_rec->device_type == BT_DEVICE_TYPE_BLE) &&
             (p_dev_rec->ble.key_type & BTM_LE_KEY_PID))