OSDN Git Service
Zhihai Xu [Mon, 31 Mar 2014 21:35:39 +0000 (21:35 +0000)]
am
20222380: am
2011d136: Merge "LE: Add API to configure MTU for a given connection (2/4)" into klp-modular-dev
* commit '
20222380588aa9a5e9b5e83b653e3c2a744da6aa':
LE: Add API to configure MTU for a given connection (2/4)
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 20:02:38 +0000 (20:02 +0000)]
am
f003a729: am
06589f6c: Merge "Bluetooth: Clear wait flag on Start response."
* commit '
f003a7292ca3fe7e7633b28c2d35e6314365dc8b':
Bluetooth: Clear wait flag on Start response.
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
Eric Laurent [Wed, 26 Mar 2014 01:36:27 +0000 (18:36 -0700)]
audio: fix set_parameters return value.
xxx_set_parameters functions were returning the status
returned by str_parms_create_str() which is incorrect.
These functions should return 0 when no error occurs.
Change-Id: I984d95457c985fbaf1a15baa522f8a84f99dd7c9
Matthew Xie [Mon, 24 Mar 2014 22:54:33 +0000 (22:54 +0000)]
am
2e3eaf6c: am
0b151acc: am
335a8a6c: resolved conflicts for merge of
f4471c7e to klp-modular-dev
* commit '
2e3eaf6c4524623ed356eed5a429dfc17992caa7':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
Matthew Xie [Mon, 24 Mar 2014 19:47:57 +0000 (19:47 +0000)]
am
0b151acc: am
335a8a6c: resolved conflicts for merge of
f4471c7e to klp-modular-dev
* commit '
0b151accb74f3c2cfc78ec538a11e2949efd71e1':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
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
Nitin Arora [Sat, 22 Feb 2014 02:20:37 +0000 (18:20 -0800)]
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 20:24:10 +0000 (20:24 +0000)]
am
8e01899e: am
a27730b4: am
67467172: Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
* commit '
8e01899e4b152b318d1cbe0ad1be98c88fb62cd2':
print MTU size after get MTU request from iphone.
Zhihai Xu [Fri, 21 Mar 2014 16:04:09 +0000 (16:04 +0000)]
am
a27730b4: am
67467172: Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
* commit '
a27730b49bdd3cfeeefc2efa90e3cb196800a8dd':
print MTU size after get MTU request from iphone.
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
Eric Laurent [Fri, 21 Mar 2014 01:23:00 +0000 (01:23 +0000)]
Merge "a2dp audio HAL: use correct interface version"
Eric Laurent [Fri, 21 Mar 2014 01:01:09 +0000 (18:01 -0700)]
a2dp audio HAL: use correct interface version
Do not use AUDIO_DEVICE_API_VERSION_CURRENT version
but AUDIO_DEVICE_API_VERSION_2_0 to reflect the version
actually implemeted.
Change-Id: I31407af7fc4769be1d259ee739422ce9f598be2e
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 21:05:08 +0000 (21:05 +0000)]
am
c0932faf: (-s ours) am
64ed2414: am
67020954: am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
c0932fafefc12f8ed8597d404d1392e367ba7136':
DO NOT MERGE: cherrypick from master to fix b/
13289050
Andre Eisenbach [Thu, 20 Mar 2014 16:33:51 +0000 (16:33 +0000)]
am
64ed2414: am
67020954: am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
64ed24148d570f5a1c8ebeb2f0336b24ecc95b9c':
DO NOT MERGE: cherrypick from master to fix b/
13289050
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 16:10:09 +0000 (16:10 +0000)]
am
a724ae33: am
593b6b9d: am
e2273716: Merge "support resolve BLE random mac address for both central and peripheral mode." into klp-modular-dev
* commit '
a724ae3347f2c4f8bcccc267cee859ab422cfedc':
support resolve BLE random mac address for both central and peripheral mode.
Zhihai Xu [Thu, 20 Mar 2014 16:05:09 +0000 (16:05 +0000)]
am
593b6b9d: am
e2273716: Merge "support resolve BLE random mac address for both central and peripheral mode." into klp-modular-dev
* commit '
593b6b9d001a184247a7ef1754bc0e52b419a4f2':
support resolve BLE random mac address for both central and peripheral mode.
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.
Matthew Xie [Thu, 20 Mar 2014 04:17:08 +0000 (04:17 +0000)]
Merge "Revert "Allow simultaneous LE Observe and BTM Inquiry/Scan""
Matthew Xie [Thu, 20 Mar 2014 04:16:38 +0000 (04:16 +0000)]
Revert "Allow simultaneous LE Observe and BTM Inquiry/Scan"
This reverts commit
890dc789cec13e2d2e5ff95574f74b1740bdecf0.
Change-Id: I8916a973ae6d278764f111267220b7751143687c
Matthew Xie [Thu, 20 Mar 2014 04:00:36 +0000 (04:00 +0000)]
Merge "Allow simultaneous LE Observe and BTM Inquiry/Scan"
Nitin Arora [Sat, 22 Feb 2014 02:20:37 +0000 (18:20 -0800)]
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
bug
12939764
Change-Id: Ifde73f17f8d40e9ebfff3b49e409591189574ee9
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
Wei Wang [Wed, 19 Mar 2014 21:29:34 +0000 (21:29 +0000)]
Merge "LE: Add status callback function for LE broadcasts"
Zhihai Xu [Fri, 14 Mar 2014 17:53:17 +0000 (17:53 +0000)]
am
092d55ff: (-s ours) am
e5caa8b4: am
d3a9e01b: am
07ea194a: Merge "DO NOT MERGE use bluetooth HID remote device name as input device name." into klp-dev
* commit '
092d55ff9f7c9e1b4e520adfa29ae18f2fcc4b83':
DO NOT MERGE use bluetooth HID remote device name as input device name.
Zhihai Xu [Fri, 14 Mar 2014 16:08:40 +0000 (16:08 +0000)]
am
e5caa8b4: am
d3a9e01b: am
07ea194a: Merge "DO NOT MERGE use bluetooth HID remote device name as input device name." into klp-dev
* commit '
e5caa8b4315a0883dbe02f0c64ad49989e4b494c':
DO NOT MERGE use bluetooth HID remote device name as input device name.
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.
Andre Eisenbach [Wed, 5 Mar 2014 23:41:53 +0000 (15:41 -0800)]
LE: Add status callback function for LE broadcasts
Change-Id: If4342050ce1141a9c2111286e7b3cccdc012a91e
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 [Wed, 12 Mar 2014 17:05:47 +0000 (17:05 +0000)]
am
d8e9a945: (-s ours) am
0d56a323: am
1d454d1b: am
f677f810: Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan" into klp-dev
* commit '
d8e9a945b901a49fecdd6ddd5cdc874ed9b8a1e2':
DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan
Zhihai Xu [Wed, 12 Mar 2014 17:05:47 +0000 (17:05 +0000)]
am
5d6bbe86: am
1eb5c9ed: am
33100619: am
69218b16: Merge changes I6673d478,I953b9ca6 into klp-dev
* commit '
5d6bbe86b76f1e6e161defdfeef3bb0aa6aec2e9':
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 [Wed, 12 Mar 2014 17:05:46 +0000 (17:05 +0000)]
am
c24a51fe: (-s ours) am
9c141a3e: am
5f6a8742: am
27420a03: (-s ours) Merge "DO NOT MERGE BLE HID device connection failure due to security error." into klp-dev
* commit '
c24a51fef6a555701ea7de875624e1dff2d065fd':
DO NOT MERGE BLE HID device connection failure due to security error.
Matthew Xie [Tue, 11 Mar 2014 23:20:41 +0000 (23:20 +0000)]
am
0d56a323: am
1d454d1b: am
f677f810: Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan" into klp-dev
* commit '
0d56a323a8ec323d4cf1d35edf4811781b7c781f':
DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan
Zhihai Xu [Tue, 11 Mar 2014 23:20:40 +0000 (23:20 +0000)]
am
1eb5c9ed: am
33100619: am
69218b16: Merge changes I6673d478,I953b9ca6 into klp-dev
* commit '
1eb5c9edcf28f0de21d407848d3cd3a91af0501c':
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 23:20:40 +0000 (23:20 +0000)]
am
9c141a3e: am
5f6a8742: am
27420a03: (-s ours) Merge "DO NOT MERGE BLE HID device connection failure due to security error." into klp-dev
* commit '
9c141a3eb506998e3f055e73aac368691148cbf8':
DO NOT MERGE BLE HID device connection failure due to security error.
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.
Matthew Xie [Thu, 16 Jan 2014 05:49:32 +0000 (21:49 -0800)]
Increasing the SDP_MTU_SIZE from 256 to the default 672 bytes
This works better with IOT of devices
bug
10588724
Change-Id: I28fd74339d8f344b056b82bf2d71e7d70be7a0fa
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:20:45 +0000 (09:20 +0000)]
am
3d4c703b: am
06ad9fde: am
45e9aaca: Merge "Fix bug in PAN code where no new PAN connections can be made."
* commit '
3d4c703b752a9f7f29badf9cc9cdeb334cb9cada':
Fix bug in PAN code where no new PAN connections can be made.
Matthew Xie [Mon, 10 Mar 2014 09:17:20 +0000 (09:17 +0000)]
am
06ad9fde: am
45e9aaca: Merge "Fix bug in PAN code where no new PAN connections can be made."
* commit '
06ad9fde2aba979b2afe4b0084fb36c604e79dcd':
Fix bug in PAN code where no new PAN connections can be made.
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:23:42 +0000 (19:23 +0000)]
am
64046623: (-s ours) am
550faf60: am
0e318b8a: am
14b75b78: Merge "DO NOT MERGE Remove the device from le backgrond connection whitelist when it\'s unpaired" into klp-dev
* commit '
6404662385dc5cc7d7d89f581d7d6e05a421b221':
DO NOT MERGE Remove the device from le backgrond connection whitelist when it's unpaired
Zhihai Xu [Sun, 9 Mar 2014 19:23:42 +0000 (19:23 +0000)]
am
cd5bfb2c: (-s ours) am
7dbaf9fa: am
0ff8f69e: am
87f26bcd: Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev
* commit '
cd5bfb2c469b7bf9e05cb5cf5eadfa6991c9cc69':
DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
Zhihai Xu [Sun, 9 Mar 2014 19:23:41 +0000 (19:23 +0000)]
am
b0c4f7c4: (-s ours) am
8506f69a: am
037c5da2: am
ea8acc97: Merge "DO NOT MERGE fix a potential native crash during bluetooth sutdown" into klp-dev
* commit '
b0c4f7c465ae90aa9d8bb4952701e1577a756ab2':
DO NOT MERGE fix a potential native crash during bluetooth sutdown
Zhihai Xu [Sun, 9 Mar 2014 19:23:41 +0000 (19:23 +0000)]
am
ad07544b: (-s ours) am
c5b335f5: am
0f8cc120: am
1e0849e9: Merge "DO NOT MERGE the HID device state is out of sync after upair." into klp-dev
* commit '
ad07544bd9afebca2853f6d49e8f2d41cdbf016f':
DO NOT MERGE the HID device state is out of sync after upair.
Zhihai Xu [Sun, 9 Mar 2014 19:23:40 +0000 (19:23 +0000)]
am
29f90b83: (-s ours) am
48453204: am
94eb9d6f: am
30466dfd: Merge "DO NOT MERGE Can only support two HID report instance for BLE HID." into klp-dev
* commit '
29f90b837856bef51afcf94e216ef5ca6c60d455':
DO NOT MERGE Can only support two HID report instance for BLE HID.
Zhihai Xu [Sun, 9 Mar 2014 19:23:40 +0000 (19:23 +0000)]
am
a714f02c: (-s ours) am
ff86b7b5: am
86254778: am
7a528bc8: Merge "DO NOT MERGE read report array out of boundary for BLE HID device." into klp-dev
* commit '
a714f02c6c1c72b9fea3f477edd02538fe5c64c6':
DO NOT MERGE read report array out of boundary for BLE HID device.
Zhihai Xu [Sun, 9 Mar 2014 19:20:27 +0000 (19:20 +0000)]
am
550faf60: am
0e318b8a: am
14b75b78: Merge "DO NOT MERGE Remove the device from le backgrond connection whitelist when it\'s unpaired" into klp-dev
* commit '
550faf608762d9f09e0113a8c060a6fcf7e4460b':
DO NOT MERGE Remove the device from le backgrond connection whitelist when it's unpaired
Zhihai Xu [Sun, 9 Mar 2014 19:20:27 +0000 (19:20 +0000)]
am
7dbaf9fa: am
0ff8f69e: am
87f26bcd: Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev
* commit '
7dbaf9fa107c78eab78a2f969615cc407851393c':
DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
Zhihai Xu [Sun, 9 Mar 2014 19:20:26 +0000 (19:20 +0000)]
am
8506f69a: am
037c5da2: am
ea8acc97: Merge "DO NOT MERGE fix a potential native crash during bluetooth sutdown" into klp-dev
* commit '
8506f69acef236a86bfede4ea20fbe6bf9efc752':
DO NOT MERGE fix a potential native crash during bluetooth sutdown
Zhihai Xu [Sun, 9 Mar 2014 19:20:26 +0000 (19:20 +0000)]
am
c5b335f5: am
0f8cc120: am
1e0849e9: Merge "DO NOT MERGE the HID device state is out of sync after upair." into klp-dev
* commit '
c5b335f58816037e7553afba166426252e7f05c7':
DO NOT MERGE the HID device state is out of sync after upair.
Zhihai Xu [Sun, 9 Mar 2014 19:20:25 +0000 (19:20 +0000)]
am
48453204: am
94eb9d6f: am
30466dfd: Merge "DO NOT MERGE Can only support two HID report instance for BLE HID." into klp-dev
* commit '
48453204ddc77eaecb8d2622e7eab91fbb66444a':
DO NOT MERGE Can only support two HID report instance for BLE HID.
Zhihai Xu [Sun, 9 Mar 2014 19:20:25 +0000 (19:20 +0000)]
am
ff86b7b5: am
86254778: am
7a528bc8: Merge "DO NOT MERGE read report array out of boundary for BLE HID device." into klp-dev
* commit '
ff86b7b5213bbe753b745998811c7f2b9f1542b5':
DO NOT MERGE read report array out of boundary for BLE HID device.
Zhihai Xu [Sun, 9 Mar 2014 19:19:05 +0000 (19:19 +0000)]
am
0ac91539: (-s ours) am
f8bd6fcf: am
c7dfda09: am
7a6fad89: Merge "DO NOT MERGE need to increase maximum number HID report for HOGP" into klp-dev
* commit '
0ac91539aeb809a6b3942d391e8a14a09ea0739c':
DO NOT MERGE need to increase maximum number HID report for HOGP
Zhihai Xu [Sun, 9 Mar 2014 19:19:05 +0000 (19:19 +0000)]
am
23453997: (-s ours) am
4c938b5d: am
af16d116: am
91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn off bluetooth.
* commit '
23453997998d19ab3fd66ab5015fc218b3a1bba6':
DO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.
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:17:00 +0000 (19:17 +0000)]
am
f8bd6fcf: am
c7dfda09: am
7a6fad89: Merge "DO NOT MERGE need to increase maximum number HID report for HOGP" into klp-dev
* commit '
f8bd6fcf75e9b62d407ca405530c800abee8be49':
DO NOT MERGE need to increase maximum number HID report for HOGP
Zhihai Xu [Sun, 9 Mar 2014 19:16:59 +0000 (19:16 +0000)]
am
4c938b5d: am
af16d116: am
91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn off bluetooth.
* commit '
4c938b5d5addd36b5f66bfea93b9db3b0e10adf6':
DO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.
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