OSDN Git Service

android-x86/system-bt.git
10 years agoam 037c5da2: am ea8acc97: Merge "DO NOT MERGE fix a potential native crash during...
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

10 years agoam 0f8cc120: am 1e0849e9: Merge "DO NOT MERGE the HID device state is out of sync...
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.

10 years agoam 94eb9d6f: am 30466dfd: Merge "DO NOT MERGE Can only support two HID report instanc...
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.

10 years agoam 86254778: am 7a528bc8: Merge "DO NOT MERGE read report array out of boundary for...
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.

10 years agoam ea8acc97: Merge "DO NOT MERGE fix a potential native crash during bluetooth sutdow...
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

10 years agoam 1e0849e9: Merge "DO NOT MERGE the HID device state is out of sync after upair...
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.

10 years agoam 30466dfd: Merge "DO NOT MERGE Can only support two HID report instance for BLE...
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.

10 years agoam 7a528bc8: Merge "DO NOT MERGE read report array out of boundary for BLE HID device...
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.

10 years agoam c7dfda09: am 7a6fad89: Merge "DO NOT MERGE need to increase maximum number HID...
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

10 years agoam af16d116: am 91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn...
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.

10 years agoam 7a6fad89: Merge "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 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

10 years agoam 91f01220: 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 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.

10 years agoMerge "DO NOT MERGE fix a potential native crash during bluetooth sutdown" 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

10 years agoMerge "DO NOT MERGE the HID device state is out of sync after upair." 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

10 years agoMerge "DO NOT MERGE Can only support two HID report instance for BLE HID." 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

10 years agoMerge "DO NOT MERGE read report array out of boundary for BLE HID device." 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

10 years agoMerge "DO NOT MERGE need to increase maximum number HID report for HOGP" 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

10 years agoDO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.
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

10 years agoDO NOT MERGE fix a potential native crash during bluetooth sutdown
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

10 years agoDO NOT MERGE the HID device state is out of sync after upair.
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

10 years agoDO NOT MERGE Can only support two HID report instance for BLE HID.
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

10 years agoDO NOT MERGE read report array out of boundary for BLE HID device.
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

10 years agoDO NOT MERGE need to increase maximum number HID report for HOGP
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

10 years agoam 6ca1594d: am b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to...
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

10 years agoam b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to advertising...
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

10 years agoam f6918978: Add HID handshake_callback
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

10 years agoDO NOT MERGE LE: Add service UUIDs and data to advertising data
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

10 years agoam be6d58f3: Fix GKI exception of calling free on an already freed buffer
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

10 years agoam f9c6502a: Change some printfs in sdp_api.c to SDP_TRACE_DEBUG
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

10 years agoAdd HID handshake_callback
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>
10 years agoFix GKI exception of calling free on an already freed buffer
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>
10 years agoChange some printfs in sdp_api.c to SDP_TRACE_DEBUG
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>
10 years agoam 509b2d73: Merge "TARGET_SIMULATOR is long dead."
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.

10 years agoMerge "TARGET_SIMULATOR is long dead."
Elliott Hughes [Thu, 27 Feb 2014 18:20:28 +0000 (18:20 +0000)]
Merge "TARGET_SIMULATOR is long dead."

10 years agoTARGET_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

10 years agoresolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp
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

10 years agoMerge "Various fixes for LP64"
Narayan Kamath [Thu, 27 Feb 2014 13:17:33 +0000 (13:17 +0000)]
Merge "Various fixes for LP64"

10 years agoam 0d702d25: Merge "Fix warning "suggest braces around empty body in an \'if\' statem...
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"

10 years agoVarious fixes for LP64
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

10 years agoMerge "Fix warning "suggest braces around empty body in an 'if' statement""
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""

10 years agoFix 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

10 years agoam 759280ee: Merge "bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding...
Matthew Xie [Wed, 26 Feb 2014 00:53:05 +0000 (00:53 +0000)]
am 759280ee: Merge "bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db" into klp-modular-dev

* commit '759280ee1f92945ed7c1c13f5ff8a037fa3bf3e4':
  bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db

10 years agoMerge "bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db" into...
Matthew Xie [Wed, 26 Feb 2014 00:47:33 +0000 (00:47 +0000)]
Merge "bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db" into klp-modular-dev

10 years agoam 4fbbe711: Merge "support peripheral mode feature to connect iphone to android...
Zhihai Xu [Tue, 25 Feb 2014 20:46:17 +0000 (20:46 +0000)]
am 4fbbe711: Merge "support peripheral mode feature to connect iphone to android device." into klp-modular-dev

* commit '4fbbe7115dd7c2f8b0df386fad4085f411beeef3':
  support peripheral mode feature to connect iphone to android device.

10 years agoMerge "support peripheral mode feature to connect iphone to android device." into...
Zhihai Xu [Tue, 25 Feb 2014 20:41:35 +0000 (20:41 +0000)]
Merge "support peripheral mode feature to connect iphone to android device." into klp-modular-dev

10 years agosupport peripheral mode feature to connect iphone to android device.
Zhihai Xu [Mon, 10 Feb 2014 18:57:13 +0000 (10:57 -0800)]
support peripheral mode feature to connect iphone to android device.

enable BLE_PERIPHERAL_MODE_SUPPORT flag and fix the bug
the discoverability flag is not set in advertisement packet,
which cause the central device(iphone) can not find android device
during scan.
use displayOnly IO cap for dory, so dory can display the pin,
and the iphone(central device) will input the pin.
bug:12797572

Change-Id: Ie15ea9e340e3692df846399b9a85aa6d2a97eba7

10 years agoam 47128cf9: Merge "Bluetooth: fix sniff issue with multiple rfcomm connection in...
Matthew Xie [Mon, 24 Feb 2014 14:25:25 +0000 (14:25 +0000)]
am 47128cf9: Merge "Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL"

* commit '47128cf95b72eedb7a6da29687b1ff6b668b59d6':
  Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL

10 years agoam 6bc62a36: Merge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"
Matthew Xie [Mon, 24 Feb 2014 14:25:25 +0000 (14:25 +0000)]
am 6bc62a36: Merge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"

* commit '6bc62a368da0a434a4e01f7bcb3273bd52a07568':
  Bluetooth: GAP: Update bonded device info immediately on NVRAM

10 years agoMerge "Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL"
Matthew Xie [Mon, 24 Feb 2014 01:29:59 +0000 (01:29 +0000)]
Merge "Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL"

10 years agoMerge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"
Matthew Xie [Sun, 23 Feb 2014 22:34:33 +0000 (22:34 +0000)]
Merge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"

10 years agoBluetooth: fix sniff issue with multiple rfcomm connection in same ACL
Pradeep Panigrahi [Wed, 18 Sep 2013 06:55:37 +0000 (12:25 +0530)]
Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL

When there are multiple rfcomm connection with same appid and peer bd
address, we were clearing jv pm control block in addition to closing
connection to service with registered app id. Since appid is common
across all the client and server app registed to jv. we were clearing
entire connection to service for this appid and peer bdadres which was
corrupting sniff logic, when another rfcomm connection exists with same
peer bdaddress. So avoiding closing of connection to the service when
multiple rfcomm connection exists in same ACL.

Change-Id: Id71ef5f7f0e00f1bda3b70a4826c31bef46caafc

10 years agoBluetooth: GAP: Update bonded device info immediately on NVRAM
Srinu Jella [Thu, 21 Nov 2013 11:40:02 +0000 (17:10 +0530)]
Bluetooth: GAP: Update bonded device info immediately on NVRAM

As the new bt-if config updation have delay in writing items
to the NVRAM, some times there is a chance of not updating
incase of battery removal happens before the actual write onto
NVRAM.

As the bonded device info is important data to store, it will
update bonded info immediately onto NVRAM.

Change-Id: I9699c8225a77d9272420334b4c76b3c1df87e459

10 years agoam 136e4b1c: Merge "Don\'t send a dummy 0 HID event when connection is closed" into...
Mike J. Chen [Fri, 14 Feb 2014 22:54:44 +0000 (22:54 +0000)]
am 136e4b1c: Merge "Don\'t send a dummy 0 HID event when connection is closed" into klp-modular-dev

* commit '136e4b1c73af97b3f743395da47f137356776090':
  Don't send a dummy 0 HID event when connection is closed

10 years agoMerge "Don't send a dummy 0 HID event when connection is closed" into klp-modular-dev
Mike J. Chen [Fri, 14 Feb 2014 19:18:11 +0000 (19:18 +0000)]
Merge "Don't send a dummy 0 HID event when connection is closed" into klp-modular-dev

10 years agoDon't send a dummy 0 HID event when connection is closed
Mike J. Chen [Fri, 14 Feb 2014 02:17:56 +0000 (18:17 -0800)]
Don't send a dummy 0 HID event when connection is closed

This was put there by Broadcom to try to handle held keys
on disconnect, but the best place to do that is in InputManager.
There's no guarantee that a report_id 1 is keyboard, and
in particular it causes game controllers to get a false
joystick move event to 0,0.

Bug 12785130

Change-Id: I85fbafa44d927082def3848132344550e8b94bb0
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoam 13a01401: Merge "Don\'t leak process-private data on Change Local Name command."
Matthew Xie [Wed, 12 Feb 2014 19:22:38 +0000 (19:22 +0000)]
am 13a01401: Merge "Don\'t leak process-private data on Change Local Name command."

* commit '13a01401b8caaa28c407fe21726adc020cfb6169':
  Don't leak process-private data on Change Local Name command.

10 years agoam fab294ca: Merge "Fix bug introduced in last change. GATT define was after BLE_INC...
Mike J. Chen [Wed, 12 Feb 2014 01:20:03 +0000 (01:20 +0000)]
am fab294ca: Merge "Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define." into klp-modular-dev

* commit 'fab294ca83b62c8e258f2bcd91018c31daf377bf':
  Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define.

10 years agoMerge "Fix bug introduced in last change. GATT define was after BLE_INCLUDED define...
Mike J. Chen [Wed, 12 Feb 2014 01:16:10 +0000 (01:16 +0000)]
Merge "Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define." into klp-modular-dev

10 years agoFix bug introduced in last change. GATT define was after BLE_INCLUDED define.
Mike J. Chen [Wed, 12 Feb 2014 00:23:31 +0000 (16:23 -0800)]
Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define.

The bug caused GATT_INCLUDED to be FALSE if not already defined.

Looks like the bluedroid codebase really can't support no GATT or SMP
if BLE_INCLUDED is true.  Lots of compiler failures (not just warnings but
real failures) if GATT or SMP are not set to TRUE when BLE_INCLUDED is true.

Not cleaning that up at this time but just fixing basic build breakage.

Change-Id: I561cd4dcb2b39e90158ce74e55dca294f55cb540
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoam b45e54f0: Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev
Mike J. Chen [Tue, 11 Feb 2014 23:29:03 +0000 (23:29 +0000)]
am b45e54f0: Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev

* commit 'b45e54f09e5496f298bb5c36354dff8ae27925f2':
  Fix warnings when BLE_INCLUDED is FALSE

10 years agoam ef04b8a2: Merge "Set some SMP and GATT to FALSE if BLE is FALSE" into klp-modular-dev
Mike J. Chen [Tue, 11 Feb 2014 23:29:02 +0000 (23:29 +0000)]
am ef04b8a2: Merge "Set some SMP and GATT to FALSE if BLE is FALSE" into klp-modular-dev

* commit 'ef04b8a221df70ac205184c1f5098c409306556d':
  Set some SMP and GATT to FALSE if BLE is FALSE

10 years agoMerge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev
Mike J. Chen [Tue, 11 Feb 2014 23:24:33 +0000 (23:24 +0000)]
Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev

10 years agoMerge "Set some SMP and GATT to FALSE if BLE is FALSE" into klp-modular-dev
Mike J. Chen [Tue, 11 Feb 2014 23:24:22 +0000 (23:24 +0000)]
Merge "Set some SMP and GATT to FALSE if BLE is FALSE" into klp-modular-dev

10 years agoMerge "Don't leak process-private data on Change Local Name command."
Matthew Xie [Tue, 11 Feb 2014 22:54:03 +0000 (22:54 +0000)]
Merge "Don't leak process-private data on Change Local Name command."

10 years agoDon't leak process-private data on Change Local Name command.
Sharvil Nanavati [Mon, 10 Feb 2014 06:21:48 +0000 (22:21 -0800)]
Don't leak process-private data on Change Local Name command.

The Change Local Name command to the controller doesn't zero out
the contents of the command buffer before setting the contents. As
a result, the controller sees both the new device name and then
random data left over on the heap from previous operations. This
random data may contain sensitive information. Although the device
name is null-terminated, a controller may inadvertently leak the
additional information over the network.

This change fixes the behaviour by zeroing out the entire command
buffer before copying the device name into it. If the device name
doesn't occupy the entire buffer, the rest of it will be zero.

http://b/12949068

Change-Id: I4dd6ce6dd6709589fcd1e23f974db820820bc8e1

10 years agoFix warnings when BLE_INCLUDED is FALSE
Mike J. Chen [Tue, 11 Feb 2014 21:51:29 +0000 (13:51 -0800)]
Fix warnings when BLE_INCLUDED is FALSE

Change-Id: I27c8ac6d5410159ed6bbef6aca5bf3b9692b0467
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoSet some SMP and GATT to FALSE if BLE is FALSE
Mike J. Chen [Tue, 11 Feb 2014 21:50:32 +0000 (13:50 -0800)]
Set some SMP and GATT to FALSE if BLE is FALSE

Also add asserts that SMP and GATT are never TRUE
if BLE is FALSE since that would make no sense.

Change-Id: I6530fe0255da0b237daa82b1b0dff286f2c5225d
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoam 384d6211: Merge "Revert "Make all warnings fatal compilation errors"" into klp...
Mike J. Chen [Tue, 11 Feb 2014 21:10:49 +0000 (21:10 +0000)]
am 384d6211: Merge "Revert "Make all warnings fatal compilation errors"" into klp-modular-dev

* commit '384d62118595b81d081af83d68c7c1de53229768':
  Revert "Make all warnings fatal compilation errors"

10 years agoMerge "Revert "Make all warnings fatal compilation errors"" into klp-modular-dev
Mike J. Chen [Tue, 11 Feb 2014 21:05:56 +0000 (21:05 +0000)]
Merge "Revert "Make all warnings fatal compilation errors"" into klp-modular-dev

10 years agoRevert "Make all warnings fatal compilation errors"
Mike J. Chen [Tue, 11 Feb 2014 21:01:26 +0000 (13:01 -0800)]
Revert "Make all warnings fatal compilation errors"

This reverts commit ba1ee422cee82449e675a52a785dac1a9200a3df.

When BLE_INCLUDED is FALSE, we still have a bunch of warnings so
revert until that path is cleaned up.

10 years agoam b83a8234: Merge changes Ifc373f95,I95eb887a,I1e6be2ab,Ia6ea939a,I147d0138, .....
Mike J. Chen [Tue, 11 Feb 2014 20:14:12 +0000 (20:14 +0000)]
am b83a8234: Merge changes Ifc373f95,I95eb887a,I1e6be2ab,Ia6ea939a,I147d0138, ... into klp-modular-dev

* commit 'b83a823466bf93f7d484f7c8d23513e0e7c1a5a8': (24 commits)
  Make all warnings fatal compilation errors
  Major warnings cleanup
  Add macro UNUSED() to bt_utils.h
  Fix unused parameter warning in static function
  Add "static" to a static function
  Fix a number of unused parameter warnings in static functions
  Fix bug with wrong parameter passed to logu
  Default send_ind_evt should be FALSE
  Fix warning "implicit declaration of function 'GAP_BleReadPeerPrefConnParams'"
  Fix unused parameter warnings in static functions by changing prototype
  Fix some unused parameter warnings in static functions
  Fix warnings about implicit declaration of bdcmp and bdcpy
  Fix warning "comparison is always true due to limited range of data type"
  Fix warning "suggest braces around empty body in an 'if' statement"
  Fix warning "comparison is always true due to limited range of data type"
  Add a function prototype for btm_ble_test_command_complete
  Change argument to return ptr rather than assign to unused local
  Fix warning "comparison is always true due to limited range of data type"
  Fix warnings about implicit declarations
  Fix warning "implicit declaration of function 'bdcmp'"
  ...

10 years agoMerge changes Ifc373f95,I95eb887a,I1e6be2ab,Ia6ea939a,I147d0138, ... into klp-modular-dev
Mike J. Chen [Tue, 11 Feb 2014 20:10:59 +0000 (20:10 +0000)]
Merge changes Ifc373f95,I95eb887a,I1e6be2ab,Ia6ea939a,I147d0138, ... into klp-modular-dev

* changes:
  Make all warnings fatal compilation errors
  Major warnings cleanup
  Add macro UNUSED() to bt_utils.h
  Fix unused parameter warning in static function
  Add "static" to a static function
  Fix a number of unused parameter warnings in static functions
  Fix bug with wrong parameter passed to logu
  Default send_ind_evt should be FALSE
  Fix warning "implicit declaration of function 'GAP_BleReadPeerPrefConnParams'"
  Fix unused parameter warnings in static functions by changing prototype
  Fix some unused parameter warnings in static functions
  Fix warnings about implicit declaration of bdcmp and bdcpy
  Fix warning "comparison is always true due to limited range of data type"
  Fix warning "suggest braces around empty body in an 'if' statement"
  Fix warning "comparison is always true due to limited range of data type"
  Add a function prototype for btm_ble_test_command_complete
  Change argument to return ptr rather than assign to unused local
  Fix warning "comparison is always true due to limited range of data type"
  Fix warnings about implicit declarations
  Fix warning "implicit declaration of function 'bdcmp'"
  Fix warning "case label value exceeds maximum value for type"
  Fix missing initializer warning
  Fix missing initializer warning
  Fix warning about missing initializer

10 years agoMake all warnings fatal compilation errors
Mike J. Chen [Sat, 1 Feb 2014 02:16:33 +0000 (18:16 -0800)]
Make all warnings fatal compilation errors

Change-Id: Ifc373f954c8019b1c52d0b1b3636362afb99fff4
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoMajor warnings cleanup
Mike J. Chen [Sat, 1 Feb 2014 02:16:59 +0000 (18:16 -0800)]
Major warnings cleanup

Mostly fixing unused parameter warnings.
A few other warnings also fixed like possible use of
unitialized variables (no real issue found, just compiler couldn't
follow the path), signed vs unsigned warning.

Also fixed some typos, indent issues, removal of dead code, etc.

Change-Id: I95eb887aefc4d559d7921f71a0af5f3bfb01ac01
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoAdd macro UNUSED() to bt_utils.h
Mike J. Chen [Sat, 1 Feb 2014 02:13:09 +0000 (18:13 -0800)]
Add macro UNUSED() to bt_utils.h

Also include bt_utils.h in some other header files commonly
included by some subsystems.

Change-Id: I1e6be2abae503c4303c92d97eeeb29981beacd10
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix unused parameter warning in static function
Mike J. Chen [Sat, 1 Feb 2014 02:09:53 +0000 (18:09 -0800)]
Fix unused parameter warning in static function

Just changed the function to not take the unused parameter

Change-Id: Ia6ea939a45583ad9b8ae83125a0294086fde8909
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoAdd "static" to a static function
Mike J. Chen [Sat, 1 Feb 2014 02:08:58 +0000 (18:08 -0800)]
Add "static" to a static function

Change-Id: I147d0138f2871d1fa873184b1e6e8075328a8501
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix a number of unused parameter warnings in static functions
Mike J. Chen [Sat, 1 Feb 2014 02:07:48 +0000 (18:07 -0800)]
Fix a number of unused parameter warnings in static functions

Since functions were static, just changed them to not take
the unused parameters.

Change-Id: I2f39684d84b1785d60167e617bc5fa79aeac4dda
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix bug with wrong parameter passed to logu
Mike J. Chen [Sat, 1 Feb 2014 02:02:14 +0000 (18:02 -0800)]
Fix bug with wrong parameter passed to logu

Caught by compiler warning "passing argument 2 of 'logu' from incompatible pointer type".

Change-Id: If6047654c9862209d3426f832a366ac884b2c9e9
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoDefault send_ind_evt should be FALSE
Mike J. Chen [Sat, 1 Feb 2014 01:58:14 +0000 (17:58 -0800)]
Default send_ind_evt should be FALSE

Bug found when looking at compiler warning about p_mcb might
be used before being initialized.

Change-Id: I6f74a3c9bb46e757d2420cc871bfe78e51256c3b
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning "implicit declaration of function 'GAP_BleReadPeerPrefConnParams'"
Mike J. Chen [Sat, 1 Feb 2014 01:49:43 +0000 (17:49 -0800)]
Fix warning "implicit declaration of function 'GAP_BleReadPeerPrefConnParams'"

Change-Id: I0e4e45d6f0ade8deb070e610baac2d1945ebc1a5
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoam a5df8e12: Merge "Accept takes a socklen_t, not an int."
Elliott Hughes [Fri, 7 Feb 2014 22:35:09 +0000 (22:35 +0000)]
am a5df8e12: Merge "Accept takes a socklen_t, not an int."

* commit 'a5df8e122f4f322d9d1d4e9c14bf998ff2e3406a':
  Accept takes a socklen_t, not an int.

10 years agoMerge "Accept takes a socklen_t, not an int."
Elliott Hughes [Fri, 7 Feb 2014 22:29:57 +0000 (22:29 +0000)]
Merge "Accept takes a socklen_t, not an int."

10 years agoAccept takes a socklen_t, not an int.
Elliott Hughes [Fri, 7 Feb 2014 20:23:05 +0000 (12:23 -0800)]
Accept takes a socklen_t, not an int.

Change-Id: I0e89aae4a560c3ed9821cbb4432f56e25f3d1c94

10 years agoresend discovery primary service ATT request with timeout
Zhihai Xu [Thu, 6 Feb 2014 04:04:48 +0000 (20:04 -0800)]
resend discovery primary service ATT request with timeout

This is to work around the problem with iphone.
The iphone didn't respond with our first ATT request
(read By group type Request for for primary service).
the clockwork/phone host keep waiting for ATT response until disconnection
from iphone due to timeout.
The workaround is to
resend discovery primary service before disconnection from remote device
when response timeout happen.
This workaround will be better for us to interop with remote BLE device.

bug:12895830
Change-Id: I236af8eca9790f2dae7098061c74cec55348ca6d

10 years agoFix unused parameter warnings in static functions by changing prototype
Mike J. Chen [Sat, 1 Feb 2014 01:13:29 +0000 (17:13 -0800)]
Fix unused parameter warnings in static functions by changing prototype

Change-Id: I9cc4646610fd3d25732caac01e8d833724238749
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix some unused parameter warnings in static functions
Mike J. Chen [Sat, 1 Feb 2014 00:37:03 +0000 (16:37 -0800)]
Fix some unused parameter warnings in static functions

Fixed by changing the prototypes of the functions and the
calling location.

Change-Id: Ic27ce9e61f5b66699b59bb14258709cb7ca733a8
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warnings about implicit declaration of bdcmp and bdcpy
Mike J. Chen [Fri, 31 Jan 2014 23:27:49 +0000 (15:27 -0800)]
Fix warnings about implicit declaration of bdcmp and bdcpy

Change-Id: Ib6ad46f566900d514d63a9538a6a8b1c53f04806
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning "comparison is always true due to limited range of data type"
Mike J. Chen [Fri, 31 Jan 2014 23:27:02 +0000 (15:27 -0800)]
Fix warning "comparison is always true due to limited range of data type"

Change-Id: I4b195607d0cd8ee135b26065eed0eef5407061b6
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix 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.

Change-Id: I0bea6a46f29bc2c4dfc6e1fa13dd35b094310294
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning "comparison is always true due to limited range of data type"
Mike J. Chen [Fri, 31 Jan 2014 23:14:08 +0000 (15:14 -0800)]
Fix warning "comparison is always true due to limited range of data type"

Change-Id: I1d59e67f507e676513aa006f265cca9179b7c2fe
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoAdd a function prototype for btm_ble_test_command_complete
Mike J. Chen [Fri, 31 Jan 2014 23:13:24 +0000 (15:13 -0800)]
Add a function prototype for btm_ble_test_command_complete

To fix warning about implicit declaration when compiling btu_hcif.c

Change-Id: Ia07ae3036c65928b6981becb12e18115f0af7769
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoChange argument to return ptr rather than assign to unused local
Mike J. Chen [Fri, 31 Jan 2014 23:06:49 +0000 (15:06 -0800)]
Change argument to return ptr rather than assign to unused local

There was a warning about local variable assigned but not used.
I believe this was actually an implementation and API problem.
The function is called "btm_sec_find_bonded_dev" and returns
a BOOLEAN about whether the search succeeded or not.  I believe
it should also return a pointer to the dev rec if the search
succeeded, but due to an API definition error, it was just
assigning a local rather than returning the pointer ot the rec.

Also add to btm_int.h a function prototype that was missing
and causing a warning about implicit declaration.

Change-Id: Ifcef3afe3acbe12f4c69472fcedd01b268f644dd
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning "comparison is always true due to limited range of data type"
Mike J. Chen [Fri, 31 Jan 2014 23:06:22 +0000 (15:06 -0800)]
Fix warning "comparison is always true due to limited range of data type"

Change-Id: I191b4c12ea6d4ed7a898b158d2ae26fffdeb471f
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warnings about implicit declarations
Mike J. Chen [Fri, 31 Jan 2014 23:04:41 +0000 (15:04 -0800)]
Fix warnings about implicit declarations

Two functions were used without including header file
and generating following warnings:

implicit declaration of function 'bta_sys_add_uuid'
implicit declaration of function 'bta_sys_remove_uuid'

Change-Id: I1c36fda7af9e838259b93bd2a29e3547d9df0eb5
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning "implicit declaration of function 'bdcmp'"
Mike J. Chen [Fri, 31 Jan 2014 23:03:44 +0000 (15:03 -0800)]
Fix warning "implicit declaration of function 'bdcmp'"

Change-Id: Ifc13cfa4b88d8483c58dd955ea69f482b06ec79a
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning "case label value exceeds maximum value for type"
Mike J. Chen [Fri, 31 Jan 2014 23:02:31 +0000 (15:02 -0800)]
Fix warning "case label value exceeds maximum value for type"

Change-Id: I1f8ef599b0d64aafe37d3422a8b43cc66ef0e6fe
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix missing initializer warning
Mike J. Chen [Fri, 31 Jan 2014 21:28:58 +0000 (13:28 -0800)]
Fix missing initializer warning

Change-Id: I13e96a25b66a0a789d1adab9e41f2315d294943d
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix missing initializer warning
Mike J. Chen [Fri, 31 Jan 2014 21:26:56 +0000 (13:26 -0800)]
Fix missing initializer warning

Change-Id: Id578a65e05a4ec0416940efdb4de2c758ca90206
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agoFix warning about missing initializer
Mike J. Chen [Fri, 31 Jan 2014 21:24:49 +0000 (13:24 -0800)]
Fix warning about missing initializer

Change-Id: Ifbee10f3de140d51b42a915cb532b58ea67c66cc
Signed-off-by: Mike J. Chen <mjchen@google.com>