OSDN Git Service

android-x86/system-bt.git
10 years agoam 29f90b83: (-s ours) am 48453204: am 94eb9d6f: am 30466dfd: Merge "DO NOT MERGE...
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.

10 years agoam a714f02c: (-s ours) am ff86b7b5: am 86254778: am 7a528bc8: Merge "DO NOT MERGE...
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.

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

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

10 years agoam 0ac91539: (-s ours) am f8bd6fcf: am c7dfda09: am 7a6fad89: Merge "DO NOT MERGE...
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

10 years agoam 23453997: (-s ours) am 4c938b5d: am af16d116: am 91f01220: DO NOT MERGE trouble...
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.

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 f8bd6fcf: am c7dfda09: am 7a6fad89: Merge "DO NOT MERGE need to increase maximum...
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

10 years agoam 4c938b5d: am af16d116: am 91f01220: DO NOT MERGE trouble syncing with fitbit and...
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.

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 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 agoam 35ed9e1d: (-s ours) am be1d4db0: am 6ca1594d: am b74fe9e2: (-s ours) DO NOT MERGE...
Andre Eisenbach [Sat, 8 Mar 2014 11:02:08 +0000 (11:02 +0000)]
am 35ed9e1d: (-s ours) am be1d4db0: am 6ca1594d: am b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to advertising data

* commit '35ed9e1d5854396f8c60554d386f017cbd85cb1a':
  DO NOT MERGE LE: Add service UUIDs and data to advertising data

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 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 be1d4db0: am 6ca1594d: am b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs...
Andre Eisenbach [Sat, 8 Mar 2014 02:15:00 +0000 (02:15 +0000)]
am be1d4db0: am 6ca1594d: am b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to advertising data

* commit 'be1d4db0862c8d9e40386dc5c9739c1803f25eca':
  DO NOT MERGE LE: Add service UUIDs and data to advertising data

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 bac0e60f: am 303a1272: am f6918978: Add HID handshake_callback
Mike J. Chen [Fri, 7 Mar 2014 20:33:48 +0000 (20:33 +0000)]
am bac0e60f: am 303a1272: am f6918978: Add HID handshake_callback

* commit 'bac0e60f37d577e5b1a47ff52c8f2a96142ee4e7':
  Add HID handshake_callback

10 years agoam 303a1272: am f6918978: Add HID handshake_callback
Mike J. Chen [Fri, 7 Mar 2014 18:55:00 +0000 (18:55 +0000)]
am 303a1272: am f6918978: Add HID handshake_callback

* commit '303a12727c96f6e39c31b0ef6a6017b5ef7972c0':
  Add HID handshake_callback

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 agoFix conditional waits in GKI_wait.
Narayan Kamath [Wed, 5 Mar 2014 16:04:31 +0000 (16:04 +0000)]
Fix conditional waits in GKI_wait.

The absolute time calculation uses CLOCK_MONOTONIC, so
make sure pthread_condattr_setclock is called with
CLOCK_MONOTONIC.

Change-Id: I0f20871e36db511961b1f17ecd3225180e893db9

10 years agoam 8dfc3e29: am 84516150: am be6d58f3: Fix GKI exception of calling free on an alread...
Mike J. Chen [Wed, 5 Mar 2014 01:44:46 +0000 (01:44 +0000)]
am 8dfc3e29: am 84516150: am be6d58f3: Fix GKI exception of calling free on an already freed buffer

* commit '8dfc3e2992456539ee6c740199f543cdb0d5a9d3':
  Fix GKI exception of calling free on an already freed buffer

10 years agoam 84516150: am be6d58f3: Fix GKI exception of calling free on an already freed buffer
Mike J. Chen [Wed, 5 Mar 2014 01:41:17 +0000 (01:41 +0000)]
am 84516150: am be6d58f3: Fix GKI exception of calling free on an already freed buffer

* commit '845161504098dcfdf8874f6ec592642f40b57547':
  Fix GKI exception of calling free on an already freed buffer

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 f6137714: am 3ff3d444: am f9c6502a: Change some printfs in sdp_api.c to SDP_TRACE_...
Mike J. Chen [Wed, 5 Mar 2014 01:28:43 +0000 (01:28 +0000)]
am f6137714: am 3ff3d444: am f9c6502a: Change some printfs in sdp_api.c to SDP_TRACE_DEBUG

* commit 'f6137714438b3ed9e2a29d1ada94b2b531bb940d':
  Change some printfs in sdp_api.c to SDP_TRACE_DEBUG

10 years agoam 3ff3d444: am f9c6502a: Change some printfs in sdp_api.c to SDP_TRACE_DEBUG
Mike J. Chen [Wed, 5 Mar 2014 01:25:51 +0000 (01:25 +0000)]
am 3ff3d444: am f9c6502a: Change some printfs in sdp_api.c to SDP_TRACE_DEBUG

* commit '3ff3d4448da74b395a14c5b88a31747e4ee7c4e0':
  Change some printfs in sdp_api.c to SDP_TRACE_DEBUG

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 33428009: am 780bc50d: am 509b2d73: Merge "TARGET_SIMULATOR is long dead."
Elliott Hughes [Thu, 27 Feb 2014 18:34:44 +0000 (18:34 +0000)]
am 33428009: am 780bc50d: am 509b2d73: Merge "TARGET_SIMULATOR is long dead."

* commit '3342800947fd6b3167e14c3858179b830dfa0644':
  TARGET_SIMULATOR is long dead.

10 years agoam 780bc50d: am 509b2d73: Merge "TARGET_SIMULATOR is long dead."
Elliott Hughes [Thu, 27 Feb 2014 18:31:16 +0000 (18:31 +0000)]
am 780bc50d: am 509b2d73: Merge "TARGET_SIMULATOR is long dead."

* commit '780bc50ded9e26ad51db651d21e1a0d489300793':
  TARGET_SIMULATOR is long dead.

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 agoam de34aea5: am 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular...
Narayan Kamath [Thu, 27 Feb 2014 13:59:26 +0000 (13:59 +0000)]
am de34aea5: am 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp

* commit 'de34aea544cb4222f24e4157b96962b09445e2c5':
  Various fixes for LP64

10 years agoam 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp
Narayan Kamath [Thu, 27 Feb 2014 13:56:09 +0000 (13:56 +0000)]
am 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp

* commit '5303f9d369946f43167b5e2423799d30c4455df1':
  Various fixes for LP64

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 273071ca: am 6b096f36: am 0d702d25: Merge "Fix warning "suggest braces around...
Narayan Kamath [Thu, 27 Feb 2014 10:31:26 +0000 (10:31 +0000)]
am 273071ca: am 6b096f36: am 0d702d25: Merge "Fix warning "suggest braces around empty body in an \'if\' statement""

* commit '273071ca5b91ca490a884ebe3b504085b9b3ca3d':
  Fix warning "suggest braces around empty body in an 'if' statement"

10 years agoam 6b096f36: am 0d702d25: Merge "Fix warning "suggest braces around empty body in...
Narayan Kamath [Thu, 27 Feb 2014 10:28:38 +0000 (10:28 +0000)]
am 6b096f36: am 0d702d25: Merge "Fix warning "suggest braces around empty body in an \'if\' statement""

* commit '6b096f363c8f40bdf5108a2dc27e7f4e9a5ee9e1':
  Fix warning "suggest braces around empty body in an 'if' statement"

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 e736740d: am 5834e63b: am 759280ee: Merge "bluetooth: hid: store ssr_max_latency...
Matthew Xie [Wed, 26 Feb 2014 00:59:47 +0000 (00:59 +0000)]
am e736740d: am 5834e63b: am 759280ee: Merge "bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db" into klp-modular-dev

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

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

* commit '5834e63bd410d708d8764f69ede256ca0ed98635':
  bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db

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 2ac65164: am 75c7597c: am 4fbbe711: Merge "support peripheral mode feature to...
Zhihai Xu [Tue, 25 Feb 2014 20:52:08 +0000 (20:52 +0000)]
am 2ac65164: am 75c7597c: am 4fbbe711: Merge "support peripheral mode feature to connect iphone to android device." into klp-modular-dev

* commit '2ac6516450336e2ec5ccbbefa0221276ea291695':
  support peripheral mode feature to connect iphone to android device.

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

* commit '75c7597c94a7d8ee5c79b75ccaede02f53dd7c9f':
  support peripheral mode feature to connect iphone to android device.

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 7d006e6b: am a69e0ae1: am 47128cf9: Merge "Bluetooth: fix sniff issue with multipl...
Matthew Xie [Mon, 24 Feb 2014 14:32:10 +0000 (14:32 +0000)]
am 7d006e6b: am a69e0ae1: am 47128cf9: Merge "Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL"

* commit '7d006e6b176172cb370cc183b4f2eab501e85c7c':
  Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL

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

* commit '9d368b68841dee6e6f581a3890433dcdc022fbb8':
  Bluetooth: GAP: Update bonded device info immediately on NVRAM

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

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

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

* commit '1292dd82812d76c54568796fbdafd1fdadc816eb':
  Bluetooth: GAP: Update bonded device info immediately on NVRAM

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 agoMerge "Bluetooth: Cleanup bt_config.xml during BLE Scan"
Matthew Xie [Sat, 22 Feb 2014 01:22:04 +0000 (01:22 +0000)]
Merge "Bluetooth: Cleanup bt_config.xml during BLE Scan"

10 years agoBluetooth: Cleanup bt_config.xml during BLE Scan
Sunny Kapdi [Wed, 20 Nov 2013 22:41:41 +0000 (14:41 -0800)]
Bluetooth: Cleanup bt_config.xml during BLE Scan

BLE Scan needs to clean up the bt_config.xml periodically so that
new entries could be added to bt_config.xml. Also, there is no
need to add BLE Random bd_addr to the bt_config.xml

Change-Id: I00ba2e50dd39a021099052cb569786f6cb2cc8b9

b/12912008

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 0c880603: am 6a342588: am 136e4b1c: Merge "Don\'t send a dummy 0 HID event when...
Mike J. Chen [Fri, 14 Feb 2014 23:41:11 +0000 (23:41 +0000)]
am 0c880603: am 6a342588: am 136e4b1c: Merge "Don\'t send a dummy 0 HID event when connection is closed" into klp-modular-dev

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

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

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

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 081ff423: am aa58a6cf: am 13a01401: Merge "Don\'t leak process-private data on...
Matthew Xie [Wed, 12 Feb 2014 23:03:13 +0000 (23:03 +0000)]
am 081ff423: am aa58a6cf: am 13a01401: Merge "Don\'t leak process-private data on Change Local Name command."

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

10 years agoam aa58a6cf: am 13a01401: Merge "Don\'t leak process-private data on Change Local...
Matthew Xie [Wed, 12 Feb 2014 22:21:38 +0000 (22:21 +0000)]
am aa58a6cf: am 13a01401: Merge "Don\'t leak process-private data on Change Local Name command."

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

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 dd7e09cf: am 17e40430: am fab294ca: Merge "Fix bug introduced in last change....
Mike J. Chen [Wed, 12 Feb 2014 01:25:28 +0000 (01:25 +0000)]
am dd7e09cf: am 17e40430: am fab294ca: Merge "Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define." into klp-modular-dev

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

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

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

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 agoam a89616ab: Fix bug introduced in last change. GATT define was after BLE_INCLUDED...
Mike J. Chen [Wed, 12 Feb 2014 01:15:21 +0000 (01:15 +0000)]
am a89616ab: Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define.

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

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 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 e80e4df1: am b45e54f0: Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp...
Mike J. Chen [Tue, 11 Feb 2014 23:32:35 +0000 (23:32 +0000)]
am e80e4df1: am b45e54f0: Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev

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

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

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

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