From: Andre Eisenbach <eisenbach@google.com>
Date: Fri, 29 May 2015 21:05:30 +0000 (-0700)
Subject: Check transport before subscribing for service changes
X-Git-Tag: android-x86-7.1-r1~394^2~216^2~81
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=53ef6df3;p=android-x86%2Fsystem-bt.git

Check transport before subscribing for service changes

Don't subscribe to the service changed characteristic if SMP pairing
was a result of cross-key pairing.

Change-Id: Ieb4901e82060e2fa2d9d0e909e384de5f6890222
Author: Chaojing Sun <cjsun@broadcom.com>
Bug: 20894154
---

diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.c
index 60da3b5a2..9593a42ed 100644
--- a/bta/dm/bta_dm_act.c
+++ b/bta/dm/bta_dm_act.c
@@ -4471,7 +4471,8 @@ static UINT8 bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT_D
             else
             {
                 sec_event.auth_cmpl.success = TRUE;
-                GATT_ConfigServiceChangeCCC(bda, TRUE, BT_TRANSPORT_LE);
+                if (!p_data->complt.smp_over_br)
+                    GATT_ConfigServiceChangeCCC(bda, TRUE, BT_TRANSPORT_LE);
             }
 
             if (bta_dm_cb.p_sec_cback)