OSDN Git Service
Wei Wang [Tue, 12 Aug 2014 20:20:05 +0000 (20:20 +0000)]
am
4ab79869: Merge "Fix batch scan not reporting regression." into lmp-dev
* commit '
4ab798699f6026247152ba8633f9179779fa5068':
Fix batch scan not reporting regression.
Wei Wang [Tue, 12 Aug 2014 20:12:38 +0000 (20:12 +0000)]
Merge "Fix batch scan not reporting regression." into lmp-dev
Chris Manton [Mon, 11 Aug 2014 23:58:11 +0000 (23:58 +0000)]
am
6c25e796: Protect hci library cleanup with mutex
* commit '
6c25e796a4d661ef76e9b6af253bbbfbae46a344':
Protect hci library cleanup with mutex
Chris Manton [Thu, 7 Aug 2014 23:23:41 +0000 (16:23 -0700)]
Protect hci library cleanup with mutex
hci library cleanup is no longer thread safe
and must have access serialized.
Change-Id: I155a09f6b0ab60dcc5e076ee1108a2bec8b96251
Wei Wang [Mon, 11 Aug 2014 06:27:57 +0000 (23:27 -0700)]
Fix batch scan not reporting regression.
b/
16912745
Change-Id: I6d011aa9c50e4352ec73b936ef9bf1503f2289d1
Andre Eisenbach [Sun, 10 Aug 2014 21:14:07 +0000 (21:14 +0000)]
am
836f6034: Merge "LE: Fix multi-advertiser not rotation BDA correctly" into lmp-dev
* commit '
836f60341c4901f7cfddf2490cf4f26f8a26e612':
LE: Fix multi-advertiser not rotation BDA correctly
Andre Eisenbach [Sun, 10 Aug 2014 21:08:57 +0000 (21:08 +0000)]
Merge "LE: Fix multi-advertiser not rotation BDA correctly" into lmp-dev
Andre Eisenbach [Sat, 9 Aug 2014 03:14:46 +0000 (20:14 -0700)]
LE: Fix multi-advertiser not rotation BDA correctly
The wrong timer function was invoked to trigger the address refresh.
Fixed to use one-shot timer instead.
Bug:
15086940
Change-Id: I2b890b0fb1ccf5a55e9d4ab70803e6d38693e3a5
Andre Eisenbach [Fri, 8 Aug 2014 17:57:51 +0000 (17:57 +0000)]
am
169cd7a2: Additional rebase fixes
* commit '
169cd7a221a79474d36e5c1697e862c1d640c064':
Additional rebase fixes
Andre Eisenbach [Fri, 8 Aug 2014 06:25:48 +0000 (23:25 -0700)]
Additional rebase fixes
Change-Id: I0bb6c9f96987a7e8b8d91473681f5e208d3b844f
Andre Eisenbach [Fri, 8 Aug 2014 03:57:18 +0000 (03:57 +0000)]
am
1097ff0b: Fix Bluedroid rebase error
* commit '
1097ff0b2c493e1541ca989681267dfa6a61ed6b':
Fix Bluedroid rebase error
Andre Eisenbach [Fri, 8 Aug 2014 03:57:16 +0000 (03:57 +0000)]
am
9dd5a9c1: LE: Add limited advertising duration capability (2/3)
* commit '
9dd5a9c11f2022fa9709f0c34f04560c21105152':
LE: Add limited advertising duration capability (2/3)
Prerepa Viswanadham [Fri, 8 Aug 2014 03:56:36 +0000 (03:56 +0000)]
am
b9447036: Fix build error in bluedroid
* commit '
b9447036ff1bc11de4a0f38c1e6337f532e6e622':
Fix build error in bluedroid
Andre Eisenbach [Fri, 8 Aug 2014 02:34:56 +0000 (19:34 -0700)]
Fix Bluedroid rebase error
Change-Id: I80a2f3767acaee6095389bb9579aad4241d7c42f
Andre Eisenbach [Thu, 7 Aug 2014 22:19:33 +0000 (15:19 -0700)]
LE: Add limited advertising duration capability (2/3)
Change-Id: Id2ebc353f1bcd94978c5c8dc55a235c92ebc7658
Prerepa Viswanadham [Fri, 8 Aug 2014 01:30:59 +0000 (18:30 -0700)]
Fix build error in bluedroid
Change-Id: I6bcf655540f13db578948ac8eddde971637ed26b
git-zhenye.broadcom.com [Fri, 8 Aug 2014 00:56:30 +0000 (00:56 +0000)]
am
d77eec93: Moved per device tx power configuration capability in bdroid_buildcfg.h
* commit '
d77eec93e5299f5bff987fceceba612b33251a14':
Moved per device tx power configuration capability in bdroid_buildcfg.h
Prerepa Viswanadham [Fri, 8 Aug 2014 00:54:33 +0000 (00:54 +0000)]
am
16fe0822: Use run time parameters to control LE features
* commit '
16fe0822ccd3eb6f66d3afd9965d25a0a0cb4c30':
Use run time parameters to control LE features
Wei Wang [Fri, 8 Aug 2014 00:53:43 +0000 (00:53 +0000)]
am
845961f2: Change max GATT apps from 10 to 32.
* commit '
845961f2f710e5fdf1c08c0c1ccc1368eeb0f6c0':
Change max GATT apps from 10 to 32.
Dmitry Grinberg [Fri, 8 Aug 2014 00:53:42 +0000 (00:53 +0000)]
am
4fb063a3: am
4badab05: (-s ours) am
c4766e31: Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
* commit '
4fb063a320a309c0b13ade1d68fb24c86ae5b683':
Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
git-zhenye.broadcom.com [Thu, 7 Aug 2014 19:50:16 +0000 (12:50 -0700)]
Moved per device tx power configuration capability in bdroid_buildcfg.h
Bug
16711526
Change-Id: Ia8099765113068fd3b211acb882702d3581bd4b1
Prerepa Viswanadham [Thu, 7 Aug 2014 18:38:06 +0000 (11:38 -0700)]
Use run time parameters to control LE features
Use values read from controller to enable and control LE features such as
multi advertising, RPA offload, maximum irk size etc
bug
15393216
Change-Id: I193e2b9a0dc61b86f667e986803571440e390160
Wei Wang [Thu, 7 Aug 2014 04:27:16 +0000 (21:27 -0700)]
Change max GATT apps from 10 to 32.
Fixes b/
15706224
Change-Id: I663c09f9c04c669fc79e6ba3330d0c83468d9ea9
Dmitry Grinberg [Wed, 6 Aug 2014 21:42:54 +0000 (21:42 +0000)]
am
4badab05: (-s ours) am
c4766e31: Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
* commit '
4badab05fadbe71a8759f46c1997ecec07700b7d':
Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
Dmitry Grinberg [Wed, 6 Aug 2014 21:38:22 +0000 (21:38 +0000)]
am
c4766e31: Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
* commit '
c4766e31eae58e417ab265b5d3ae637efcedfb5e':
Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
Dmitry Grinberg [Wed, 6 Aug 2014 21:18:08 +0000 (21:18 +0000)]
Revert "commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"
Bug:
16786608
This reverts commit
8d502374a5f903e85d77c2a4476f90dd9d85de47.
Change-Id: I29aae4e68960578ade8b6b7206c97da9b947bbef
Matthew Xie [Wed, 6 Aug 2014 19:50:06 +0000 (19:50 +0000)]
am
c331807e: BT MAP: added support for email sharing over BT
* commit '
c331807e3c3a0e15180a11325e1635ae5268aa39':
BT MAP: added support for email sharing over BT
Matthew Xie [Thu, 27 Mar 2014 14:22:02 +0000 (15:22 +0100)]
BT MAP: added support for email sharing over BT
- added more dynamic SDP record name setting for MAP in order to support
multiple mas instances with different name strings.
Change-Id: I7a78da3ba9707a08d1f6a6245c27fc3f1b86d244
Andre Eisenbach [Tue, 5 Aug 2014 17:07:41 +0000 (17:07 +0000)]
am
62a54c5b: Merge "Add transport parameter to createBond() function (2/4)" into lmp-dev
* commit '
62a54c5b374c1eb9d3664da2717f82fdeea8bb7e':
Add transport parameter to createBond() function (2/4)
Andre Eisenbach [Tue, 5 Aug 2014 16:57:48 +0000 (16:57 +0000)]
Merge "Add transport parameter to createBond() function (2/4)" into lmp-dev
Andre Eisenbach [Tue, 5 Aug 2014 00:50:10 +0000 (17:50 -0700)]
Add transport parameter to createBond() function (2/4)
Change-Id: I8176b932da705f8d0a230abd56bc5faa00005eb6
Matthew Xie [Mon, 4 Aug 2014 23:36:43 +0000 (23:36 +0000)]
am
372a9f7d: Merge "Blacklist Apple HID devices to skip SDP" into lmp-dev
* commit '
372a9f7d53682a853f4c5f5fc7d2c36c044f2513':
Blacklist Apple HID devices to skip SDP
Wei Wang [Sun, 3 Aug 2014 23:53:03 +0000 (23:53 +0000)]
am
f877e4c6: Merge "LE batchscan consolidated reports" into lmp-dev
* commit '
f877e4c6990a05c6a609980efa4fc575aa7eb51e':
LE batchscan consolidated reports
Andre Eisenbach [Sun, 3 Aug 2014 23:34:09 +0000 (23:34 +0000)]
am
422a0c45: Merge "Fixed wrong return condition when all RFCOMM data was sent succesfully" into lmp-dev
* commit '
422a0c4559fd6dec081e8cfa76cfd4cde5529586':
Fixed wrong return condition when all RFCOMM data was sent succesfully
Andre Eisenbach [Sun, 3 Aug 2014 23:23:09 +0000 (23:23 +0000)]
am
f37456d5: LE: Fix random address resolution when done in the stack
* commit '
f37456d5a14773e25386629803f7dcaecb37fb99':
LE: Fix random address resolution when done in the stack
Andre Eisenbach [Sun, 3 Aug 2014 22:57:06 +0000 (15:57 -0700)]
LE: Fix random address resolution when done in the stack
If the local device does not support random address resolution in the
Bluetooth chip, it has to be performed in the host stack. This patch
fixes some instances where address resolution was not performed
properly, causing device reconnection to fail.
Change-Id: Ifb84a9fa44995caa3680d9a0b4248ef911eb9ad0
Thierry Strudel [Fri, 1 Aug 2014 21:46:33 +0000 (21:46 +0000)]
am
84a3b261: update test to build and run with latest BT HAL
* commit '
84a3b261821b31ed33c21fe1ed4da918a33901d6':
update test to build and run with latest BT HAL
Thierry Strudel [Fri, 1 Aug 2014 05:53:46 +0000 (22:53 -0700)]
update test to build and run with latest BT HAL
Change-Id: I497ac4649081a3244549e067fe6d5181ee2f7b2a
Signed-off-by: Thierry Strudel <thierry.strudel@intel.com>
Satya Calloji [Fri, 1 Aug 2014 13:49:58 +0000 (13:49 +0000)]
am
3489ca9d: ADV data override issue
* commit '
3489ca9d44bbf0d3f00b1f5cd9675694774d48a8':
ADV data override issue
Mudumba Ananth [Fri, 1 Aug 2014 13:48:19 +0000 (13:48 +0000)]
am
32cab09f: Added function headers.
* commit '
32cab09fbf90dd0a1ef787682c74acc64e0b93c3':
Added function headers.
Wei Wang [Sun, 3 Aug 2014 23:46:06 +0000 (23:46 +0000)]
Merge "LE batchscan consolidated reports" into lmp-dev
Satya Calloji [Wed, 16 Jul 2014 00:37:13 +0000 (17:37 -0700)]
LE batchscan consolidated reports
Provide consolidated batchscan reports
Change-Id: Ie3da240c38b014fe29d4394438f3858fd4e731fa
Matthew Xie [Mon, 4 Aug 2014 23:25:19 +0000 (23:25 +0000)]
Merge "Blacklist Apple HID devices to skip SDP" into lmp-dev
Priti Aghera [Thu, 26 Jun 2014 18:23:51 +0000 (11:23 -0700)]
Blacklist Apple HID devices to skip SDP
Remote initiated HID connection fails as Apple devices goes out of resource.
During incoming connection SDP is performed after authentication is successful.
Apple device is out of resources and thus sends No resources available error
for SDP request. In order to avoid this situation a apple HID devices are blacklisted
to skip SDP after authentication in case of incoming connections.
bug
15566403
Change-Id: Ic7fdfd2543c90e81341b4d5b7bef9c1d1c11b928
Andre Eisenbach [Sun, 3 Aug 2014 23:29:41 +0000 (23:29 +0000)]
Merge "Fixed wrong return condition when all RFCOMM data was sent succesfully" into lmp-dev
Zhenye Zhu [Fri, 1 Aug 2014 18:32:32 +0000 (11:32 -0700)]
Fixed wrong return condition when all RFCOMM data was sent succesfully
Bug:
16566991
Change-Id: I4e0d2487b71e2d8ad8e571e88d2623db2852bb1e
Satya Calloji [Thu, 31 Jul 2014 20:18:40 +0000 (13:18 -0700)]
ADV data override issue
Setting scan response overrides advertiseData
Bug
16577710
Change-Id: I5ca28568495c8e487648a5f36d945e4443cba639
Mudumba Ananth [Wed, 30 Jul 2014 06:17:41 +0000 (23:17 -0700)]
Added function headers.
-> Added function headers to bta_hh_le_read_battery_level_descr_cmpl
and bta_hh_le_find_service_inst_by_battery_inst_id.
Bug:
16560957
Change-Id: I1f9867f397e4bb4a848a42ac8547016e8b36898c
Andre Eisenbach [Thu, 31 Jul 2014 00:14:05 +0000 (00:14 +0000)]
am
6b5a01fc: Merge "Unnecessary l2cap idle timer is being restarted everytime mode change to active" into lmp-dev
* commit '
6b5a01fca2087889d5d6e94a3e9b02ba4db74c2d':
Unnecessary l2cap idle timer is being restarted everytime mode change to active
Andre Eisenbach [Thu, 31 Jul 2014 00:03:27 +0000 (00:03 +0000)]
am
301eb0f8: Merge "Service change indication is not sent to a bonded remote device sometimes" into lmp-dev
* commit '
301eb0f86921a4b7f131594c22e4a16208106e32':
Service change indication is not sent to a bonded remote device sometimes
Andre Eisenbach [Thu, 31 Jul 2014 00:03:26 +0000 (00:03 +0000)]
am
9cc19a63: Merge "ADV flag is missing LE discoverable flag" into lmp-dev
* commit '
9cc19a63fe736d2b44181ba4757a286db2afa935':
ADV flag is missing LE discoverable flag
Andre Eisenbach [Wed, 30 Jul 2014 23:57:37 +0000 (23:57 +0000)]
am
c62fe857: Merge "Execute Write Response shall be sent after the attributes are written" into lmp-dev
* commit '
c62fe8574db0ed5d0f469e0632bad30238b8d5e7':
Execute Write Response shall be sent after the attributes are written
Andre Eisenbach [Wed, 30 Jul 2014 23:57:36 +0000 (23:57 +0000)]
am
a2459c75: Merge "Update simultaneous LE BR/EDR host support bit for 4.1 controller and 4.1 stack" into lmp-dev
* commit '
a2459c75c41b5a5a906d09087208dbfafb6dfbf3':
Update simultaneous LE BR/EDR host support bit for 4.1 controller and 4.1 stack
Satya Calloji [Wed, 30 Jul 2014 23:57:36 +0000 (23:57 +0000)]
am
d773c2cf: Incorrect data type in local LE features bt_local_le_features_t of wrong size
* commit '
d773c2cfd3675aaec431a42b79b26b24e0555ed9':
Incorrect data type in local LE features bt_local_le_features_t of wrong size
Andre Eisenbach [Wed, 30 Jul 2014 23:51:06 +0000 (23:51 +0000)]
am
e0380135: Merge "Cannot resolve RPA from a DUMO device when being a peripheral device" into lmp-dev
* commit '
e03801358ff4e20c2744772f88bcafbb13535c80':
Cannot resolve RPA from a DUMO device when being a peripheral device
Satya Calloji [Wed, 30 Jul 2014 05:08:55 +0000 (22:08 -0700)]
Incorrect data type in local LE features
bt_local_le_features_t of wrong size
b/
16653133
Change-Id: I81da7f8c6b9151b8def8d4e3c655cf746d0e3db9
Andre Eisenbach [Wed, 30 Jul 2014 23:58:51 +0000 (23:58 +0000)]
Merge "Unnecessary l2cap idle timer is being restarted everytime mode change to active" into lmp-dev
Mudumba Ananth [Fri, 4 Jul 2014 06:51:38 +0000 (23:51 -0700)]
Unnecessary l2cap idle timer is being restarted everytime mode change to active
Bug:
16560957
Change-Id: I543cab003dbf2be9e5f63667f32bdeb78d1d56d1
Mudumba Ananth [Wed, 30 Jul 2014 22:32:36 +0000 (22:32 +0000)]
am
8942572f: When HOGP reconnection fails, it will lose all cached HID report
* commit '
8942572fcb6efb0d68193d0892a11590559afa0f':
When HOGP reconnection fails, it will lose all cached HID report
Mudumba Ananth [Fri, 4 Jul 2014 09:57:49 +0000 (02:57 -0700)]
When HOGP reconnection fails, it will lose all cached HID report
When HOGP reconnection fails, it will lose all cached HID reports.
This will cause the following connection report all HID reports as
unknown reports, can not recover until rebond the device.
Make sure to remove cached reports only if open
fails during HID report discovery process.
Bug:
16560957
Change-Id: Ib23adad4a2721acabb5129779c0e9f2ff30d5e39
Andre Eisenbach [Wed, 30 Jul 2014 23:47:14 +0000 (23:47 +0000)]
Merge "Execute Write Response shall be sent after the attributes are written" into lmp-dev
Mudumba Ananth [Fri, 4 Jul 2014 10:45:11 +0000 (03:45 -0700)]
Execute Write Response shall be sent after the attributes are written
Bug:
16560957
Change-Id: I085a2218644615bc13f5a0d0d78fc2afe0605a04
Andre Eisenbach [Wed, 30 Jul 2014 23:43:00 +0000 (23:43 +0000)]
Merge "Update simultaneous LE BR/EDR host support bit for 4.1 controller and 4.1 stack" into lmp-dev
Mudumba Ananth [Fri, 4 Jul 2014 06:42:34 +0000 (23:42 -0700)]
Update simultaneous LE BR/EDR host support bit for 4.1 controller and 4.1 stack
Need to set simultaneous LE BR/EDR host support bit when BTE DMT included stack or newer version
running on top of 4.1 controller.
Bug:
16560957
Change-Id: I3e2827dbaf8b4259d4f00f14b1a5f587e4424bdc
Satya Calloji [Wed, 30 Jul 2014 18:24:11 +0000 (18:24 +0000)]
am
4a7ad9be: Tx power is 0 in ADV packet
* commit '
4a7ad9be81cc2b515502f2c1fb1b7ec7e3104146':
Tx power is 0 in ADV packet
Dmitry Grinberg [Wed, 30 Jul 2014 16:40:38 +0000 (16:40 +0000)]
am
5f263484: am
83970699: (-s ours) am
8d502374: commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530
* commit '
5f263484e3dc418c5498bba5abda40815db9fad3':
commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530
Satya Calloji [Tue, 29 Jul 2014 22:32:51 +0000 (15:32 -0700)]
Tx power is 0 in ADV packet
b/
15412969 Tx power is always 0 in advertising packet
Change-Id: I7eb1f16b5fb1ab4ed669ba6a72f9603885cebc99
Dmitry Grinberg [Wed, 30 Jul 2014 00:49:44 +0000 (00:49 +0000)]
am
83970699: (-s ours) am
8d502374: commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530
* commit '
839706997f7c16a67d4dcc70889f2e1a934a5da2':
commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530
Andre Eisenbach [Wed, 30 Jul 2014 23:55:52 +0000 (23:55 +0000)]
Merge "Service change indication is not sent to a bonded remote device sometimes" into lmp-dev
Mudumba Ananth [Fri, 4 Jul 2014 06:56:42 +0000 (23:56 -0700)]
Service change indication is not sent to a bonded remote device sometimes
-> The service change indication was requested before
GATT profile finished processing the connection callback.
-> Sending service change indication after
profile connection is up solves the problem.
Bug:
16560957
Change-Id: I99dd7528883efbedcbf785132fe6aaa3aea5b42c
Andre Eisenbach [Wed, 30 Jul 2014 23:53:17 +0000 (23:53 +0000)]
Merge "ADV flag is missing LE discoverable flag" into lmp-dev
Mudumba Ananth [Fri, 4 Jul 2014 09:46:05 +0000 (02:46 -0700)]
ADV flag is missing LE discoverable flag
ADV flag is missing LE discoverable flag when setting device in
general discoverable mode. Device discovery mode is masked off
by a wrong flag that cause the problem. Use the correct discoverable
mask will solve this problem.
Bug:
16560957
Change-Id: Ic11d1497d38dedfea6feeaa84f36aed90590939c
Andre Eisenbach [Wed, 30 Jul 2014 23:38:19 +0000 (23:38 +0000)]
Merge "Cannot resolve RPA from a DUMO device when being a peripheral device" into lmp-dev
Mudumba Ananth [Fri, 4 Jul 2014 10:19:07 +0000 (03:19 -0700)]
Cannot resolve RPA from a DUMO device when being a peripheral device
Stack needs to allow DUMO devie to use RPA per 4.1 spec requirement.
Bug:
16560957
Change-Id: I8af5cade6dbd2da04aa05a4aa66663a767678d00
Andre Eisenbach [Tue, 29 Jul 2014 20:27:44 +0000 (20:27 +0000)]
am
5fb6df1f: Merge "LE: Fix problem where pending command is not sent after pairing" into lmp-dev
* commit '
5fb6df1f90de6e69f712a07c819468b74a6233ef':
LE: Fix problem where pending command is not sent after pairing
Dmitry Grinberg [Tue, 29 Jul 2014 20:16:42 +0000 (20:16 +0000)]
am
8d502374: commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530
* commit '
8d502374a5f903e85d77c2a4476f90dd9d85de47':
commit
001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530
Satya Calloji [Tue, 29 Jul 2014 18:37:57 +0000 (18:37 +0000)]
am
efaddcb2: Bug
16498557 Inconsistent energy reporting
* commit '
efaddcb2cec21bfcdcadfa86720d3ca720a4253d':
Bug
16498557 Inconsistent energy reporting
Satya Calloji [Tue, 29 Jul 2014 06:22:05 +0000 (23:22 -0700)]
Bug
16498557 Inconsistent energy reporting
Fix for inconsistent energy reporting
Change-Id: Iddd77354624a631ca8db52f12086d3afa5751d36
Nitin Shivpure [Mon, 28 Jul 2014 23:16:20 +0000 (23:16 +0000)]
am
e85eb5a7: Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
* commit '
e85eb5a7c3ea7eaca09cbb33920435d809b4dd3d':
Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
Hemant Gupta [Mon, 28 Jul 2014 22:53:22 +0000 (22:53 +0000)]
am
76f645ea: Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
* commit '
76f645ea6f5cd22e464dcbdb1e73ecb50c5ea87c':
Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
Hemant Gupta [Mon, 28 Jul 2014 22:00:25 +0000 (22:00 +0000)]
am
554485a6: Bluetooth: Getbuf returning invalid buffer pointer - do not merge
* commit '
554485a60e73aa5ce6e05242f817b3c05bc45eb3':
Bluetooth: Getbuf returning invalid buffer pointer - do not merge
Matthew Xie [Mon, 28 Jul 2014 22:00:24 +0000 (22:00 +0000)]
am
68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev
* commit '
68732140f7a0b3b982eaee6065eabd201fa94286':
PM: Stop Power Manager Timer if in sniff mode - do not merge
Nitin Shivpure [Thu, 3 Oct 2013 13:36:12 +0000 (19:06 +0530)]
Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
A case where DUT is paired with remoteDeviceA & remoteDeviceB.
remoteDeviceA is not pagable(turned off or some other reason).
DUT(PANU) try to connect remoteDeviceA(NAP). But connection is
unsuccessful, Because remoteDeviceA is not pagable, In this scenario
btpan_conn Database is not cleaning up at btif layer. Later
remoteDeviceB(PANU) connect to DUT(NAP) & connection is succesful,
When remoteDeviceB disconnect existing connection. As database
still has remoteDeviceA BD address at Btif layer. remoteDeviceA
BD address is passed instead of remoteDeviceB BD address from Btif
to UI. So remoteDeviceB still shows connected on UI. Cleaning up
pan_conn database for particular pan connection at BTIF layer,
whichever connection is not successful will solve this issue.
Change-Id: I31dfe3ef46295e74bbfb57563e4fd4fc7155f006
Hemant Gupta [Thu, 29 Aug 2013 10:16:49 +0000 (15:46 +0530)]
Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
This patch updates HID Devices security mask to BTA_SEC_ENCRYPT from
BTA_SEC_NONE. Without this change it was observed that on BT Reset,
authentication and encryption were not initiated by DUT for incoming
HID Control L2CAP Connection Request from remote HID Keyboard device.
Change-Id: I484fbae1294fde386bd7959467214f9968e381e9
Hemant Gupta [Fri, 12 Jul 2013 14:35:54 +0000 (20:05 +0530)]
Bluetooth: Getbuf returning invalid buffer pointer - do not merge
Getbuff is checking for the pool which can accommodate
requested size, but is changing the pool with a restricted
check and not checking for the free memory size in that pool.
Added a check to avoid returng the wrong pool free buf pointer.
Without this patch, SDP Codenomicon TestSuite crash is observed
on Bluedroid stack.
Change-Id: Id66d460c5a40d8c3208438d7cfaf729e9b355184
Eric Laurent [Mon, 28 Jul 2014 21:05:22 +0000 (21:05 +0000)]
am
ac7e0423: Merge "audio HAL: add parameters to open stream functions" into lmp-dev
* commit '
ac7e04235b3a6d54be8bbc6901ca0ad4a5d18f68':
audio HAL: add parameters to open stream functions
Andre Eisenbach [Tue, 29 Jul 2014 20:18:30 +0000 (20:18 +0000)]
Merge "LE: Fix problem where pending command is not sent after pairing" into lmp-dev
Andre Eisenbach [Fri, 25 Jul 2014 22:46:21 +0000 (15:46 -0700)]
LE: Fix problem where pending command is not sent after pairing
If a read/write or other operation triggers SMP pairing with a remote
device, the operation should complete once pairing has finished. This
patch fixes a bug where the pending command was not sent after pairing.
Bug:
16405565
Change-Id: Idb2e54931c71b0a9e009cac318712eb9f5c7e15a
Adam Hampson [Mon, 28 Jul 2014 15:52:44 +0000 (15:52 +0000)]
am
9b57f080: Bluetooth: DIS: Only read the requested DIS characteristics
* commit '
9b57f0802ec52f9169ebbd164c6f104724190ec1':
Bluetooth: DIS: Only read the requested DIS characteristics
Adam Hampson [Fri, 25 Jul 2014 20:39:11 +0000 (13:39 -0700)]
Bluetooth: DIS: Only read the requested DIS characteristics
The BLE HID code only uses the PNP_ID characteristic from DIS.
Previously the DIS client would read all DIS characteristics
when a read request was made. This change allows the DIS user to
request certain DIS characteristics.
Bug:
16521059
Change-Id: I09c24718bb2e2da73c518b64c3cbdd07e7d6cf27
Signed-off-by: Adam Hampson <ahampson@google.com>
Satya Calloji [Fri, 25 Jul 2014 23:16:52 +0000 (23:16 +0000)]
am
6e2d9db5: Settings app does not show BLE devices
* commit '
6e2d9db5148176d88d7f48c3b2ad5b27c57ca14d':
Settings app does not show BLE devices
Satya Calloji [Tue, 8 Jul 2014 23:18:58 +0000 (16:18 -0700)]
Settings app does not show BLE devices
Settings does not show all BLE devices when scan filter is set
Change-Id: I669ef3b87a9a21dfce26c1e22b5d984a5ea6f75c
Dmitry Grinberg [Fri, 25 Jul 2014 22:10:11 +0000 (15:10 -0700)]
commit
001ccea74ec61b1be00c8ede827f55c0359d1051
Author: Nitin Shivpure <nshivpur@codeaurora.org>
Date: Tue Jun 17 16:29:18 2014 +0530
LW: Set sniff interval as 1.28s for JV RFCOMM server
- Reducing sniff timer value to 1s for JV RFCOMM Server
to reduce power consumption on wearable in idle scenario.
- Changing sniff interval value as 1.28s for BTA_DM_PM_SNIFF
to reduce power consumption on wearable, when wearable is
in sniff with remote device.
CRs-Fixed: 686491
Bug:
16378407
Change-Id: Ibe4650a63a97fec86bb7d5ed8bafad9e56269287
Sharvil Nanavati [Thu, 24 Jul 2014 23:35:16 +0000 (23:35 +0000)]
am
fb3fca63: Merge "Work around race condition between thread shutdown and vendor lib shutdown." into lmp-dev
* commit '
fb3fca6325b07604790475612189438325b2cd59':
Work around race condition between thread shutdown and vendor lib shutdown.
Matthew Xie [Thu, 24 Jul 2014 23:34:09 +0000 (23:34 +0000)]
am
f2c9280a: Merge "Increase BLE background scan window for faster re-connection" into lmp-dev
* commit '
f2c9280a1c7647c06278f31738575caf1b85027e':
Increase BLE background scan window for faster re-connection
Matthew Xie [Mon, 28 Jul 2014 21:36:50 +0000 (21:36 +0000)]
Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev
Hemant Gupta [Thu, 12 Jun 2014 07:49:15 +0000 (13:19 +0530)]
PM: Stop Power Manager Timer if in sniff mode - do not merge
Power manager timer is started when ACL link is in active mode
depending on profile connected. This timer was never stopped
when link was put in sniff mode by remote device preventing
system from going to sleep since timer is still active resulting
in extra power consumption.
Change-Id: I7569eed3ad7e0487e411377977b4f0671f24df12
Eric Laurent [Mon, 28 Jul 2014 20:57:10 +0000 (20:57 +0000)]
Merge "audio HAL: add parameters to open stream functions" into lmp-dev
Eric Laurent [Mon, 28 Jul 2014 00:27:35 +0000 (17:27 -0700)]
audio HAL: add parameters to open stream functions
Pass device address (and audio source for inputs) to
open_output_stream() and open_input_stream() audio HAL functions.
Bug:
14815883.
Change-Id: I4f66478606349ab64d880923c53de00a11d74d25
Prerepa Viswanadham [Thu, 24 Jul 2014 19:47:17 +0000 (19:47 +0000)]
am
81b03192: Fix build for non BLE supported targets(nakasi and manta)
* commit '
81b03192d4284acc7c9903f5b183927797dceca4':
Fix build for non BLE supported targets(nakasi and manta)