OSDN Git Service
Zhihai Xu [Wed, 2 Apr 2014 23:21:25 +0000 (23:21 +0000)]
am
d5733232: open GATT client didn\'t reserve the BLE link if open after connected.
* commit '
d5733232313da1a9a6c27c37c1ce8dc2d7c790ac':
open GATT client didn't reserve the BLE link if open after connected.
Zhihai Xu [Mon, 3 Mar 2014 20:50:13 +0000 (12:50 -0800)]
open GATT client didn't reserve the BLE link if open after connected.
need to reserve the BLE link to avoid BLE disconnection.
BTA_GATTC_OPEN_ERROR won't resereve the BLE link usage.
use BTA_GATTC_OPEN instead of BTA_GATTC_OPEN_ERROR to reserve the
BLE link. other the stack disconnect the BLE link due to no Gatt interface
use this connection.
bug:
13228455
Change-Id: I1f9daa2171668f2ae535d998b401f1f0825d0451
Mike J. Chen [Wed, 2 Apr 2014 01:02:36 +0000 (01:02 +0000)]
am
3576c564: Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
* commit '
3576c564b33c20b5e2e90fdd3bca7ce24392ca50':
Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:02:36 +0000 (01:02 +0000)]
am
0df29ac9: Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
* commit '
0df29ac95d057a1bf74b003fa6dd6459743bcf54':
Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:02:35 +0000 (01:02 +0000)]
am
5be3cb02: Fix compiler warnings when BLE_INCLUDED is FALSE
* commit '
5be3cb02b6947a5f115eee0c8a419f99b936c296':
Fix compiler warnings when BLE_INCLUDED is FALSE
Mike J. Chen [Tue, 1 Apr 2014 19:54:27 +0000 (12:54 -0700)]
Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
Change-Id: I14acefd66291adc2119daf97bd364b2eecf18d51
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 1 Apr 2014 19:54:00 +0000 (12:54 -0700)]
Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
Change-Id: I716927939c0f3090f16be4b2329ef22d9a6ca734
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 1 Apr 2014 19:52:09 +0000 (12:52 -0700)]
Fix compiler warnings when BLE_INCLUDED is FALSE
Change-Id: I0d8f861d8a9a94586885c9acd683dd040249a465
Signed-off-by: Mike J. Chen <mjchen@google.com>
Zhihai Xu [Tue, 1 Apr 2014 00:13:01 +0000 (00:13 +0000)]
am
221b822c: Merge "Workaround IPHONE problem" into klp-modular-dev
* commit '
221b822ce1c42f4a51abc384cf09ca09b6180a9c':
Workaround IPHONE problem
Zhihai Xu [Mon, 31 Mar 2014 23:00:42 +0000 (23:00 +0000)]
Merge "Workaround IPHONE problem" into klp-modular-dev
Zhihai Xu [Tue, 18 Mar 2014 22:27:05 +0000 (15:27 -0700)]
Workaround IPHONE problem
When we send LL_ENC_REQ to iphone early, iphone didn't send
LL_ENC_RESPONSE back to us, later the iphone will disconnect from us.
The workaround is to send LL_ENC_REQ after receive first ATT read request
from iphone, Iphone will be ready at that time by experiment.
bug:
13417692
Change-Id: Ic42dda36b927df260113771152cff67032b22e5f
Zhihai Xu [Mon, 31 Mar 2014 21:41:14 +0000 (21:41 +0000)]
am
9b971dc5: Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-modular-dev
* commit '
9b971dc52f5933c04e4f49ad99c9949df961afc5':
treat BTA_BUSY as success to avoid unpair the BLE device
Zhihai Xu [Mon, 31 Mar 2014 21:35:45 +0000 (21:35 +0000)]
Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-modular-dev
Zhihai Xu [Mon, 31 Mar 2014 21:28:48 +0000 (21:28 +0000)]
am
2011d136: Merge "LE: Add API to configure MTU for a given connection (2/4)" into klp-modular-dev
* commit '
2011d136791ec93c0670edc00e64122415c926a0':
LE: Add API to configure MTU for a given connection (2/4)
Zhihai Xu [Mon, 31 Mar 2014 21:22:21 +0000 (21:22 +0000)]
Merge "LE: Add API to configure MTU for a given connection (2/4)" into klp-modular-dev
Matthew Xie [Mon, 31 Mar 2014 19:56:06 +0000 (19:56 +0000)]
am
06589f6c: Merge "Bluetooth: Clear wait flag on Start response."
* commit '
06589f6c61579105aa10e35960d59a408f9eff52':
Bluetooth: Clear wait flag on Start response.
Matthew Xie [Mon, 31 Mar 2014 19:45:33 +0000 (19:45 +0000)]
Merge "Bluetooth: Clear wait flag on Start response."
Andre Eisenbach [Tue, 25 Mar 2014 13:31:17 +0000 (06:31 -0700)]
LE: Add API to configure MTU for a given connection (2/4)
bug:
13571470
Change-Id: I932905590ee9c40cb67e7d09715c0f8e59d2f662
Matthew Xie [Mon, 24 Mar 2014 19:44:57 +0000 (19:44 +0000)]
am
335a8a6c: resolved conflicts for merge of
f4471c7e to klp-modular-dev
* commit '
335a8a6c08abfbea29dead003b4fa95fca786ccd':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
Matthew Xie [Mon, 24 Mar 2014 19:37:40 +0000 (12:37 -0700)]
resolved conflicts for merge of
f4471c7e to klp-modular-dev
Change-Id: I89ce6df8f59efa8cee63775eff58262ecf438db3
Nitin Arora [Sat, 22 Feb 2014 02:20:37 +0000 (18:20 -0800)]
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
This patch allows BTM inquiry and LE observe to be launched
and overlap each others' occurance by redirecting results
and handling states accordingly.
CRs-Fixed: 579505
Conflicts:
stack/btm/btm_ble_gap.c
bug
12939764
Change-Id: Ifde73f17f8d40e9ebfff3b49e409591189574ee0
Zhihai Xu [Fri, 21 Mar 2014 15:59:54 +0000 (15:59 +0000)]
am
67467172: Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
* commit '
6746717209435aac27eedeebdf67da1a1fbc5e5a':
print MTU size after get MTU request from iphone.
Zhihai Xu [Fri, 21 Mar 2014 15:55:48 +0000 (15:55 +0000)]
Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
Zhihai Xu [Fri, 21 Mar 2014 00:50:12 +0000 (17:50 -0700)]
print MTU size after get MTU request from iphone.
bug:
13568537
Change-Id: If1a4e93b7ef53662bd740da0d3bb91fe747de031
Andre Eisenbach [Thu, 20 Mar 2014 16:24:10 +0000 (16:24 +0000)]
am
67020954: am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
670209545cbf585165029d8866972ade111785c5':
DO NOT MERGE: cherrypick from master to fix b/
13289050
Zhihai Xu [Thu, 20 Mar 2014 15:46:19 +0000 (15:46 +0000)]
am
e2273716: Merge "support resolve BLE random mac address for both central and peripheral mode." into klp-modular-dev
* commit '
e2273716129882b8f457913ae126895b690f3544':
support resolve BLE random mac address for both central and peripheral mode.
Andre Eisenbach [Thu, 20 Mar 2014 03:36:47 +0000 (03:36 +0000)]
am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
a4611ac05f07360785adcff8640da01a3894e4c5':
DO NOT MERGE: cherrypick from master to fix b/
13289050
Andre Eisenbach [Wed, 5 Mar 2014 23:41:53 +0000 (15:41 -0800)]
DO NOT MERGE: cherrypick from master to fix b/
13289050
LE: Add status callback function for LE broadcasts
Change-Id: If4342050ce1141a9c2111286e7b3cccdc012a91e
Zhihai Xu [Wed, 19 Mar 2014 22:36:39 +0000 (22:36 +0000)]
Merge "support resolve BLE random mac address for both central and peripheral mode." into klp-modular-dev
Zhihai Xu [Fri, 14 Mar 2014 16:01:02 +0000 (16:01 +0000)]
am
d3a9e01b: am
07ea194a: Merge "DO NOT MERGE use bluetooth HID remote device name as input device name." into klp-dev
* commit '
d3a9e01b2d5e8b1fc899475b0157646dcf107618':
DO NOT MERGE use bluetooth HID remote device name as input device name.
Zhihai Xu [Fri, 14 Mar 2014 15:56:42 +0000 (15:56 +0000)]
am
07ea194a: Merge "DO NOT MERGE use bluetooth HID remote device name as input device name." into klp-dev
* commit '
07ea194ac2518e98961632c4d1909f0af0809ea9':
DO NOT MERGE use bluetooth HID remote device name as input device name.
Zhihai Xu [Thu, 13 Mar 2014 22:21:37 +0000 (15:21 -0700)]
treat BTA_BUSY as success to avoid unpair the BLE device
when switch from peripheral mode, both server and client will
call btif_gatt_check_encrypted_link, the first call will start the
encryption. the second call will get callback with BTA_BUSY status,
before encryption complete, which cause unpair with the remote device.
we shouldnot treat BTA_BUSY as error.
bug:
13417692
Change-Id: I065432dde2553e8ccee3a14a7b321b85bca8d3ba
Zhihai Xu [Tue, 11 Mar 2014 22:01:45 +0000 (15:01 -0700)]
support resolve BLE random mac address for both central and peripheral mode.
bug:
12990335
Change-Id: Ica42dcf039487b7b01454ce9255f3f6fae2faaaf
Zhihai Xu [Wed, 12 Mar 2014 23:04:46 +0000 (23:04 +0000)]
Merge "DO NOT MERGE use bluetooth HID remote device name as input device name." into klp-dev
Matthew Xie [Tue, 11 Mar 2014 19:19:20 +0000 (19:19 +0000)]
am
1d454d1b: am
f677f810: Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan" into klp-dev
* commit '
1d454d1b88846b75bdd70508e51bd2a33211b0f8':
DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan
Zhihai Xu [Tue, 11 Mar 2014 19:19:20 +0000 (19:19 +0000)]
am
33100619: am
69218b16: Merge changes I6673d478,I953b9ca6 into klp-dev
* commit '
33100619c0d881ee390ebf30a20b2cc5ad029d8d':
DO NOT MERGE BLE stack doesn't handle multiple l2cap_conn_update requests
DO NOT MERGE sometime the BLE connection parameter isnot updated for the first time
Zhihai Xu [Tue, 11 Mar 2014 19:19:19 +0000 (19:19 +0000)]
am
5f6a8742: am
27420a03: (-s ours) Merge "DO NOT MERGE BLE HID device connection failure due to security error." into klp-dev
* commit '
5f6a874230b3df8c6b67c22d45f0fe2edc91aa08':
DO NOT MERGE BLE HID device connection failure due to security error.
Zhihai Xu [Fri, 6 Dec 2013 22:29:29 +0000 (14:29 -0800)]
DO NOT MERGE use bluetooth HID remote device name as input device name.
bug:
12003067
Change-Id: I74e4921047a27ee79fa1e3cd58056fde2958e60f
Matthew Xie [Tue, 11 Mar 2014 17:43:52 +0000 (17:43 +0000)]
am
f677f810: Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan" into klp-dev
* commit '
f677f81068640857f791276c472e34b08d08f3e6':
DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan
Zhihai Xu [Tue, 11 Mar 2014 17:43:34 +0000 (17:43 +0000)]
am
69218b16: Merge changes I6673d478,I953b9ca6 into klp-dev
* commit '
69218b169bd0ff9fdf1c5de148b3807e70de85de':
DO NOT MERGE BLE stack doesn't handle multiple l2cap_conn_update requests
DO NOT MERGE sometime the BLE connection parameter isnot updated for the first time
Zhihai Xu [Tue, 11 Mar 2014 17:43:34 +0000 (17:43 +0000)]
am
27420a03: (-s ours) Merge "DO NOT MERGE BLE HID device connection failure due to security error." into klp-dev
* commit '
27420a0327c04ce9407d2fe9138dde7f6dfe94e0':
DO NOT MERGE BLE HID device connection failure due to security error.
Matthew Xie [Mon, 10 Mar 2014 18:04:56 +0000 (18:04 +0000)]
Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan" into klp-dev
Matthew Xie [Mon, 10 Mar 2014 09:11:27 +0000 (09:11 +0000)]
am
45e9aaca: Merge "Fix bug in PAN code where no new PAN connections can be made."
* commit '
45e9aaca1c4e49f22cc23105aed6c625ad0d1278':
Fix bug in PAN code where no new PAN connections can be made.
Matthew Xie [Mon, 10 Mar 2014 07:31:13 +0000 (07:31 +0000)]
Merge "Fix bug in PAN code where no new PAN connections can be made."
Zhihai Xu [Mon, 10 Mar 2014 01:08:14 +0000 (01:08 +0000)]
Merge changes I6673d478,I953b9ca6 into klp-dev
* changes:
DO NOT MERGE BLE stack doesn't handle multiple l2cap_conn_update requests
DO NOT MERGE sometime the BLE connection parameter isnot updated for the first time
Zhihai Xu [Sun, 9 Mar 2014 19:18:21 +0000 (19:18 +0000)]
am
0e318b8a: am
14b75b78: Merge "DO NOT MERGE Remove the device from le backgrond connection whitelist when it\'s unpaired" into klp-dev
* commit '
0e318b8a540fc13a296b05cd7f1c287d27f9708d':
DO NOT MERGE Remove the device from le backgrond connection whitelist when it's unpaired
Zhihai Xu [Sun, 9 Mar 2014 19:18:21 +0000 (19:18 +0000)]
am
0ff8f69e: am
87f26bcd: Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev
* commit '
0ff8f69e73503b342abd0eb02769e78b49f3fbef':
DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
Zhihai Xu [Sun, 9 Mar 2014 19:18:20 +0000 (19:18 +0000)]
am
037c5da2: am
ea8acc97: Merge "DO NOT MERGE fix a potential native crash during bluetooth sutdown" into klp-dev
* commit '
037c5da204c8efd00286135914e9d99dfd6edcdf':
DO NOT MERGE fix a potential native crash during bluetooth sutdown
Zhihai Xu [Sun, 9 Mar 2014 19:18:20 +0000 (19:18 +0000)]
am
0f8cc120: am
1e0849e9: Merge "DO NOT MERGE the HID device state is out of sync after upair." into klp-dev
* commit '
0f8cc120e796c3e019ba0e2a8147ef4bd054f805':
DO NOT MERGE the HID device state is out of sync after upair.
Zhihai Xu [Sun, 9 Mar 2014 19:18:19 +0000 (19:18 +0000)]
am
94eb9d6f: am
30466dfd: Merge "DO NOT MERGE Can only support two HID report instance for BLE HID." into klp-dev
* commit '
94eb9d6f5239d777e9219723319d0d12c305afd0':
DO NOT MERGE Can only support two HID report instance for BLE HID.
Zhihai Xu [Sun, 9 Mar 2014 19:18:19 +0000 (19:18 +0000)]
am
86254778: am
7a528bc8: Merge "DO NOT MERGE read report array out of boundary for BLE HID device." into klp-dev
* commit '
862547788582d2b90b8007862c037099e429594b':
DO NOT MERGE read report array out of boundary for BLE HID device.
Zhihai Xu [Sun, 9 Mar 2014 19:15:23 +0000 (19:15 +0000)]
am
14b75b78: Merge "DO NOT MERGE Remove the device from le backgrond connection whitelist when it\'s unpaired" into klp-dev
* commit '
14b75b785b730f95ddccfc7a31b048ed0277c96b':
DO NOT MERGE Remove the device from le backgrond connection whitelist when it's unpaired
Zhihai Xu [Sun, 9 Mar 2014 19:15:23 +0000 (19:15 +0000)]
am
87f26bcd: Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev
* commit '
87f26bcdd92ea462266caf539edb4174834cac17':
DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
Zhihai Xu [Sun, 9 Mar 2014 19:15:22 +0000 (19:15 +0000)]
am
ea8acc97: Merge "DO NOT MERGE fix a potential native crash during bluetooth sutdown" into klp-dev
* commit '
ea8acc971f7c01427fd239e54344b43ac1a31e1c':
DO NOT MERGE fix a potential native crash during bluetooth sutdown
Zhihai Xu [Sun, 9 Mar 2014 19:15:22 +0000 (19:15 +0000)]
am
1e0849e9: Merge "DO NOT MERGE the HID device state is out of sync after upair." into klp-dev
* commit '
1e0849e99bdd716b7e172269cdad1d78b60a7ded':
DO NOT MERGE the HID device state is out of sync after upair.
Zhihai Xu [Sun, 9 Mar 2014 19:15:21 +0000 (19:15 +0000)]
am
30466dfd: Merge "DO NOT MERGE Can only support two HID report instance for BLE HID." into klp-dev
* commit '
30466dfd399b787ab0fca166b842c280d28feebf':
DO NOT MERGE Can only support two HID report instance for BLE HID.
Zhihai Xu [Sun, 9 Mar 2014 19:15:21 +0000 (19:15 +0000)]
am
7a528bc8: Merge "DO NOT MERGE read report array out of boundary for BLE HID device." into klp-dev
* commit '
7a528bc860c349b9d6ae6f8d6c86d54f9448cb0e':
DO NOT MERGE read report array out of boundary for BLE HID device.
Zhihai Xu [Sun, 9 Mar 2014 19:14:51 +0000 (19:14 +0000)]
am
c7dfda09: am
7a6fad89: Merge "DO NOT MERGE need to increase maximum number HID report for HOGP" into klp-dev
* commit '
c7dfda09d04575c68c99a0f3feccf906fa70e3f6':
DO NOT MERGE need to increase maximum number HID report for HOGP
Zhihai Xu [Sun, 9 Mar 2014 19:14:50 +0000 (19:14 +0000)]
am
af16d116: am
91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn off bluetooth.
* commit '
af16d11685e040b0cf332e729f8f4a0ab6ef0e16':
DO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.
Zhihai Xu [Sun, 9 Mar 2014 19:11:56 +0000 (19:11 +0000)]
am
7a6fad89: Merge "DO NOT MERGE need to increase maximum number HID report for HOGP" into klp-dev
* commit '
7a6fad896244a387901572f70b1ce3471712ae34':
DO NOT MERGE need to increase maximum number HID report for HOGP
Zhihai Xu [Sun, 9 Mar 2014 19:11:56 +0000 (19:11 +0000)]
am
91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn off bluetooth.
* commit '
91f012208070d71e6e9e0f38aa36e78e99f2ff4e':
DO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.
Zhihai Xu [Sun, 9 Mar 2014 19:08:59 +0000 (19:08 +0000)]
Merge "DO NOT MERGE BLE HID device connection failure due to security error." into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:08:35 +0000 (19:08 +0000)]
Merge "DO NOT MERGE Remove the device from le backgrond connection whitelist when it's unpaired" into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:08:05 +0000 (19:08 +0000)]
Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:07:33 +0000 (19:07 +0000)]
Merge "DO NOT MERGE fix a potential native crash during bluetooth sutdown" into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:07:17 +0000 (19:07 +0000)]
Merge "DO NOT MERGE the HID device state is out of sync after upair." into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:06:38 +0000 (19:06 +0000)]
Merge "DO NOT MERGE Can only support two HID report instance for BLE HID." into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:05:49 +0000 (19:05 +0000)]
Merge "DO NOT MERGE read report array out of boundary for BLE HID device." into klp-dev
Zhihai Xu [Sun, 9 Mar 2014 19:05:37 +0000 (19:05 +0000)]
Merge "DO NOT MERGE need to increase maximum number HID report for HOGP" into klp-dev
Zhihai Xu [Wed, 15 Jan 2014 01:46:26 +0000 (17:46 -0800)]
DO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.
this is to work around broadcom firmware problem to handle
unsolicited command complete event for HCI_LE_Create_Connection_Cancel
and LE connection complete event with status error code (0x2)
unknown connection identifier from bluetooth controller
the workaround is to release the HCI connection to avoid out of sync
with bluetooth controller, which cause BT can't be turned off.
bug:
11614046
Change-Id: Ia5c5ad0c6c9b1a4f03253cac8a7caaf21341c88c
Zhihai Xu [Wed, 18 Dec 2013 04:33:09 +0000 (20:33 -0800)]
DO NOT MERGE BLE stack doesn't handle multiple l2cap_conn_update requests
we can define 4 bits as flags:
1. L2C_BLE_CONN_UPDATE_DISABLE:
if set it means disable update connection parameter. otherwise enable
2.L2C_BLE_NEW_CONN_PARAM:
if set, it means we have new connection parameter which is needed to be configured
if possible(after update done or enable).
3.L2C_BLE_UPDATE_PENDING:
if set, it means waiting for connection parameter update finished.
this flag will be cleared in btu_ble_ll_conn_param_upd_evt.
will be set when we call btsnd_hcic_ble_upd_ll_conn_params
4.L2C_BLE_NOT_DEFAULT_PARAM:
if set, it means we don't use the default connection parameter.
so when we disable update,
we need to configure default connection parameter.
with these 4 flags, we can replace all these states:
UPD_ENABLED, UPD_DISABLED, UPD_PENDING and UPD_UPDATED.
so we can cover all the corner cases which aren't handled
by original code.
bug:
11450715
Change-Id: I6673d4783a8063bf9e8a213c6669800f86e67945
Zhihai Xu [Sun, 17 Nov 2013 01:07:38 +0000 (17:07 -0800)]
DO NOT MERGE sometime the BLE connection parameter isnot updated for the first time
When we receive the BLE connection parameter update
from remote device after smp_send_pair_req before
start BLE service discovery(bta_gattc_set_discover_st).
We will miss update this BLE connection parameter.
The reason is we call
L2CA_EnableUpdateBleConnParams(p_cb->pairing_bda, FALSE);
in smp_send_pair_req ,We change the state to UPD_DISABLED.
When we receive the new BLE connection parameter from
remote device, we will update the state to UPD_PENDING,
which will update the new connection parameter
when enable the connection parameter update.
when we start BLE service discovery
we call L2CA_EnableUpdateBleConnParams(p_srcb->server_bda, FALSE);
in bta_gattc_set_discover_st, We will update the state back to
UPD_DISABLED, which will cause we miss updating
the new connection parameter when enable the connection parameter update.
The fix is don't change the state to UPD_DISABLED
when the state is UPD_PENDING for disabling.
bug:
11727252
Change-Id: I953b9ca669e3460e18b340e7779cc54e03d6305b
Zhihai Xu [Wed, 13 Nov 2013 04:18:37 +0000 (20:18 -0800)]
DO NOT MERGE BLE HID device connection failure due to security error.
When HID BLE device start encryption, if some other GATT application
already start encryption(but not finished yet) by calling
gatt_security_check_start. The HID BLE device will be failed to start
encryption, which will cause it to disconnect the BLE HID connection.
The solution is to check whether we already started the encryption
, If the encryption is already started, wait until the encryption
finished, then continue to start security check for BLE HID device.
add encrytion complete event to notify all GATT client encryption done.
filter the event just for BTA HH LE GATT client.
bug:
11636246
Change-Id: If58e57c623cc8cfa05208587b010bec68c71306c
Zhihai Xu [Sat, 16 Nov 2013 01:55:46 +0000 (17:55 -0800)]
DO NOT MERGE Remove the device from le backgrond connection whitelist when it's unpaired
this is due to we didn't remove the device from the white list before unpair
Which cause a fake pair request from remote device triggered
right after the acl is disconnected.
The fix is to remove the BLE device from whitelist before unpair.
Also fix a problem return wrong device handle from bta_hh_le_add_device.
if bta_hh_le_add_device is called right after reboot, before we connect HID device.
This is normally true for a previous paired device, which we saved in the nvram.
The wrong device handle will cause the removing HID device from while list failed
after unpair the HID device.
bug:
11676338
Change-Id: Id5b45b2829da9a990dfd1dbae0c15764b16c2bfb
Zhihai Xu [Sat, 16 Nov 2013 02:57:28 +0000 (18:57 -0800)]
DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
we call smp_proc_release_delay to setup a timer.
We will send a pair failure message to uplayer after the time expired.
Right before the time expire, the l2cap connection is disconnected
from remote device, we receive L2C_DISC, which will call smp_delay_terminate,
smp_delay_terminate will send a pair success message to uplayer.
The fix is not to change the status if the remote device disconnect the link
bug:
11716967
Change-Id: I8ca63599a170ec86913785aafea552301cec37df
Zhihai Xu [Tue, 26 Nov 2013 01:30:59 +0000 (17:30 -0800)]
DO NOT MERGE fix a potential native crash during bluetooth sutdown
When bluetooth is initialized which call gki_buffer_init,
the buffer pool is allocated by GKI_os_malloc which is
to call libc malloc function.
When bluetooth is cleanup which call GKI_shutdown,
the buffer pool will be freed by GKI_os_free
which is to call libc free function.
So if we access the buffer, after the whole buffer pool is freed,
we will get this native crash.
if we call cleanup during bluetooth disabling:
the state is still BTIF_CORE_STATE_DISABLING,
then GKI_shutdown will call before bte_main_disable
( bt_hc_if->cleanup();), which is before userial thread exit.
Then we may trigger this native crash.
bug:
11793775
Change-Id: Ic8ced12848d25f918a28f4d5ba29b803d6ac5bd7
Zhihai Xu [Sat, 16 Nov 2013 05:18:25 +0000 (21:18 -0800)]
DO NOT MERGE the HID device state is out of sync after upair.
the HID device state is out of sync between java layer and bluedroid stack after upair.
This will cause the HID device can't be connected after repair.
YOu can find the following error message
E/HidService( 1452): Hid Device not disconnected: 00:15:9E:20:29:41
bug:
11718702
Change-Id: I271bb77a2cc205c5a0ef396db86b87902d29966b
Zhihai Xu [Wed, 18 Dec 2013 22:51:52 +0000 (14:51 -0800)]
DO NOT MERGE Can only support two HID report instance for BLE HID.
The follwoing code cause this problem:
BTA_HH_LE_RPT_INST_ID_MAP(s,c)=(UINT8)(((s)<<4)||(c))
The code use || instead of |, this cause we can only generate
two instance HID report 0 and 1(false and true).
bug:
12213520
Change-Id: If6b7cfd9633255401aef12aafd918ee147f256b6
Zhihai Xu [Wed, 18 Dec 2013 18:06:13 +0000 (10:06 -0800)]
DO NOT MERGE read report array out of boundary for BLE HID device.
report array out of boundary when read HID report reference
descriptor for BLE HID device.
bug:
12208657
Change-Id: Ic60fd7555045f367b4fcd606510f52f60e36995e
Zhihai Xu [Thu, 19 Dec 2013 02:10:26 +0000 (18:10 -0800)]
DO NOT MERGE need to increase maximum number HID report for HOGP
The Mat mouse have more than 10 report (11),
which exceed our limitation
bug:
12214036
Change-Id: Id578bf7959f73dc3bd57664eccf49ab5580ec76b
Andre Eisenbach [Sat, 8 Mar 2014 02:11:16 +0000 (02:11 +0000)]
am
6ca1594d: am
b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to advertising data
* commit '
6ca1594d1d633a94ea237c136460017151d1d61e':
DO NOT MERGE LE: Add service UUIDs and data to advertising data
Andre Eisenbach [Sat, 8 Mar 2014 02:07:29 +0000 (02:07 +0000)]
am
b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to advertising data
* commit '
b74fe9e2c9fc0939f5c18282c985622f20b78d2a':
DO NOT MERGE LE: Add service UUIDs and data to advertising data
Mike J. Chen [Fri, 7 Mar 2014 18:51:59 +0000 (18:51 +0000)]
am
f6918978: Add HID handshake_callback
* commit '
f691897800e086b6caf238ee78d560526e69c67d':
Add HID handshake_callback
Rohit Singh [Thu, 23 Jan 2014 13:27:11 +0000 (18:57 +0530)]
Bluetooth: Clear wait flag on Start response.
When remote device does not responds to get capability causing
HAL layer to be blocked hence change is made to clear wait flag
on receiving Start response
Change-Id: I8190742fab18340e3eaa01f748bba26a3d4d17e6
Sunny Kapdi [Wed, 20 Nov 2013 22:41:41 +0000 (14:41 -0800)]
DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan
BLE Scan needs to clean up the bt_config.xml periodically so that
new entries could be added to bt_config.xml. Also, there is no
need to add BLE Random bd_addr to the bt_config.xml
Change-Id: I00ba2e50dd39a021099052cb569786f6cb2cc8b9
b/
12912008
(cherry picked from commit
377cb1407ee6ee1ff91b15bfa7052abed1023d18)
Change-Id: I3fa0286c96782822a8fdac14b05bbb6f98636e50
Andre Eisenbach [Fri, 8 Nov 2013 18:23:52 +0000 (10:23 -0800)]
DO NOT MERGE LE: Add service UUIDs and data to advertising data
Add support for UUIDs and custom service data in the advertising and
scan response records.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: I6470427ad194871488cc90f3ab384b9ecf326b15
Mike J. Chen [Wed, 5 Mar 2014 01:38:23 +0000 (01:38 +0000)]
am
be6d58f3: Fix GKI exception of calling free on an already freed buffer
* commit '
be6d58f35e66b9e57cf4978be68840cbc8ac2fc9':
Fix GKI exception of calling free on an already freed buffer
Mike J. Chen [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
f9c6502a: Change some printfs in sdp_api.c to SDP_TRACE_DEBUG
* commit '
f9c6502a109b0506916969fe016148bd6addf129':
Change some printfs in sdp_api.c to SDP_TRACE_DEBUG
Mike J. Chen [Tue, 25 Feb 2014 18:16:30 +0000 (10:16 -0800)]
Add HID handshake_callback
It is called when the equivalent pkt is received from the HID
client as a normal response to set_report() and set_protocol_mode(),
and for errors for get_report() and get_protocol_mode().
Change-Id: I26ec37348e597f294f83907bbd256c88db5ac2ef
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 25 Feb 2014 02:07:14 +0000 (18:07 -0800)]
Fix GKI exception of calling free on an already freed buffer
Various parts of btif_hh.c were creating GKI buffers and
keeping references to them and freeing them in odd and
unnecessary ways. The buffer is freed by lower levels
of the stack once the buffer has been sent to the chip
at the l2c layer and shouldn't be freed by btif_hh itself
since it's possible to double free, and there could
also be race conditions with other threads already processing
the buffer while the reference is freed if the API calls
are invoked again before the previous invocation was completely
processed.
Also added a helper routine to simplify buffer creation and
initialization.
Change-Id: Ia6039983502e2670b2325d90310244edf843b692
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 25 Feb 2014 02:11:17 +0000 (18:11 -0800)]
Change some printfs in sdp_api.c to SDP_TRACE_DEBUG
The printfs were going to console, which is generally not useful
in Android.
Change-Id: I3b08247c916dc084dfb004ac71fe234d9a541927
Signed-off-by: Mike J. Chen <mjchen@google.com>
Elliott Hughes [Thu, 27 Feb 2014 18:25:41 +0000 (18:25 +0000)]
am
509b2d73: Merge "TARGET_SIMULATOR is long dead."
* commit '
509b2d7358545945eb22dde2449d4f8d6e3b3b09':
TARGET_SIMULATOR is long dead.
Elliott Hughes [Thu, 27 Feb 2014 18:20:28 +0000 (18:20 +0000)]
Merge "TARGET_SIMULATOR is long dead."
Elliott Hughes [Thu, 27 Feb 2014 18:19:20 +0000 (10:19 -0800)]
TARGET_SIMULATOR is long dead.
Change-Id: I6ba4a55c865370f12ae30f445661b54bbc714f8a
Narayan Kamath [Thu, 27 Feb 2014 13:34:37 +0000 (13:34 +0000)]
resolved conflicts for merge of
277ba466 to klp-modular-dev-plus-aosp
Change-Id: Idc42f72a94c205cfe94feb220651a483cf418e84
Narayan Kamath [Thu, 27 Feb 2014 13:17:33 +0000 (13:17 +0000)]
Merge "Various fixes for LP64"
Narayan Kamath [Thu, 27 Feb 2014 10:26:13 +0000 (10:26 +0000)]
am
0d702d25: Merge "Fix warning "suggest braces around empty body in an \'if\' statement""
* commit '
0d702d250777d385983b9f7c18467a764b29a7ed':
Fix warning "suggest braces around empty body in an 'if' statement"
Kévin PETIT [Wed, 12 Feb 2014 17:24:01 +0000 (17:24 +0000)]
Various fixes for LP64
Changes include
- Cast numbers to their proper length before casting to a pointer.
- Use intptr_t when pointers are stored as integers.
- Eliminate 'implicit declaration' warnings
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Change-Id: I5664a087c5fbc322baa9178552404dbe9a992359
Narayan Kamath [Thu, 27 Feb 2014 10:19:46 +0000 (10:19 +0000)]
Merge "Fix warning "suggest braces around empty body in an 'if' statement""
Mike J. Chen [Fri, 31 Jan 2014 23:25:12 +0000 (15:25 -0800)]
Fix warning "suggest braces around empty body in an 'if' statement"
The body of an if statement could become empty if the macro body
is NULL and cause the if to apply to the next line instead.
Signed-off-by: Mike J. Chen <mjchen@google.com>
(cherry picked from
dbdc69f4aed8a4eb3af31982c4722b10ee774740)
Change-Id: Ie4a18920e1fc959910451a70edcff6d7fd16e501