OSDN Git Service

android-x86/system-bt.git
9 years agoam 122622f9: am 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write...
Matthew Xie [Tue, 4 Nov 2014 02:49:21 +0000 (02:49 +0000)]
am 122622f9: am 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge: 98ad505 automerge: f81ffdb automerge: 6d11a01

* commit '122622f97c7e020deb223843792a386282e99337':

9 years agoam 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag...
Matthew Xie [Tue, 4 Nov 2014 00:19:14 +0000 (00:19 +0000)]
am 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge: 98ad505 automerge: f81ffdb
automerge: 6d11a01

* commit '6d11a01aa3770a3b23086f08c9691617bb0c9578':

9 years agoam b3cebcbc: am 020cccca: am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetoot...
Simon Wilson [Mon, 3 Nov 2014 22:34:40 +0000 (22:34 +0000)]
am b3cebcbc: am 020cccca: am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge: 8403c6d

* commit 'b3cebcbc353eab5b4920f1ccf69b69560b636e93':

9 years agoam aa7a28a3: am 36eac517: am 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handli...
Mallikarjuna GB [Mon, 3 Nov 2014 22:31:58 +0000 (22:31 +0000)]
am aa7a28a3: am 36eac517: am 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge: f9336d3  -s ours

* commit 'aa7a28a3efe8e48f80c4ecf0c8b7ee0cbe275877':

9 years agoam 9e7ad87f: am 9624c4d6: am 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbu...
Maggie_Lee [Mon, 3 Nov 2014 22:31:57 +0000 (22:31 +0000)]
am 9e7ad87f: am 9624c4d6: am 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge: 0e74efe

* commit '9e7ad87f5ed2ca9591fbd56e30657063f76fd04e':

9 years agoam 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag...
Matthew Xie [Mon, 3 Nov 2014 21:20:44 +0000 (21:20 +0000)]
am 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge: 98ad505 automerge: f81ffdb

* commit '87303c76d7e472818b3379475241191cd2b3e3aa':

9 years agoIncrement seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge...
Matthew Xie [Mon, 3 Nov 2014 21:13:21 +0000 (21:13 +0000)]
Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge: 98ad505
automerge: f81ffdb

* commit 'f81ffdb1804dfe759c6a67cfc40a7c4fb599b127':

9 years agoam 020cccca: am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf...
Simon Wilson [Mon, 3 Nov 2014 20:56:14 +0000 (20:56 +0000)]
am 020cccca: am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge: 8403c6d

* commit '020ccccabd8bfb7bb863433a86793d3df6c32ed5':

9 years agoam 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invali...
Simon Wilson [Mon, 3 Nov 2014 20:47:29 +0000 (20:47 +0000)]
am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge: 8403c6d

* commit '5fe98634c3bd19660d2f3533f83b9beca15a94ab':

9 years agoam ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer...
Simon Wilson [Mon, 3 Nov 2014 20:40:34 +0000 (20:40 +0000)]
am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer"
automerge: 8403c6d

* commit '8403c6d2a012adf87bed9d34176bfaa6a343463c':

9 years agoam 36eac517: am 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmen...
Mallikarjuna GB [Mon, 3 Nov 2014 20:37:52 +0000 (20:37 +0000)]
am 36eac517: am 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge: f9336d3  -s ours

* commit '36eac517f8ac4220315673fb9fbe172ae5430c7d':

9 years agoam 9624c4d6: am 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning...
Maggie_Lee [Mon, 3 Nov 2014 20:37:51 +0000 (20:37 +0000)]
am 9624c4d6: am 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge: 0e74efe

* commit '9624c4d6ee066ffc70c9f920b073dafecfb81b8e':

9 years agoam 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP...
Mallikarjuna GB [Mon, 3 Nov 2014 20:29:47 +0000 (20:29 +0000)]
am 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge: f9336d3  -s ours

* commit '27c93b253feaea8f5144d3e8957478575c4df13c':

9 years agoam 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer...
Maggie_Lee [Mon, 3 Nov 2014 20:29:46 +0000 (20:29 +0000)]
am 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge: 0e74efe

* commit '36ba410e35e924aad27cd6556e2346af5e606363':

9 years agoam 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet
Mallikarjuna GB [Mon, 3 Nov 2014 20:20:07 +0000 (20:20 +0000)]
am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet
automerge: f9336d3  -s ours

* commit 'f9336d34b5168d4c97476ea88dad586d481c8397':

9 years agoam c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer
Maggie_Lee [Mon, 3 Nov 2014 20:20:03 +0000 (20:20 +0000)]
am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer
automerge: 0e74efe

* commit '0e74efe56b678c85f35e158a40d9828661cfa2d4':

9 years agoam 59f80103: Merge "audio HAL: remove misleading error log" into lmp-mr1-dev
Eric Laurent [Fri, 31 Oct 2014 00:16:41 +0000 (00:16 +0000)]
am 59f80103: Merge "audio HAL: remove misleading error log" into lmp-mr1-dev

* commit '59f801031d9d28aa65ecffbefb40f23b255b082d':
  audio HAL: remove misleading error log

9 years agoam 903285cb: am 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota
Prerepa Viswanadham [Thu, 30 Oct 2014 19:01:32 +0000 (19:01 +0000)]
am 903285cb: am 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota
automerge: 3a14106

* commit '3a14106e20be86c3abe496e6d36a0b6e67e52c38':
  Don't starve a BT ACL link with 0 xmit quota

9 years agoMerge "audio HAL: remove misleading error log" into lmp-mr1-dev
Eric Laurent [Thu, 30 Oct 2014 16:03:11 +0000 (16:03 +0000)]
Merge "audio HAL: remove misleading error log" into lmp-mr1-dev

9 years agoam 41388b8a: Merge "Make sure now_us returns a value bigger than the previous one...
Matthew Xie [Thu, 30 Oct 2014 11:03:28 +0000 (11:03 +0000)]
am 41388b8a: Merge "Make sure now_us returns a value bigger than the previous one" into lmp-mr1-dev

* commit '41388b8a9ef23849b981c848d70f5b0c11e72d07':
  Make sure now_us returns a value bigger than the previous one

9 years agoaudio HAL: remove misleading error log
Eric Laurent [Thu, 30 Oct 2014 00:17:31 +0000 (17:17 -0700)]
audio HAL: remove misleading error log

Bug: 17916028.
Change-Id: I4badb9208eeb973a08b4f8463ee287f6bfb3dd01

9 years agoam 903285cb: am 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota
Prerepa Viswanadham [Wed, 29 Oct 2014 18:51:16 +0000 (18:51 +0000)]
am 903285cb: am 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota

* commit '903285cb2f4fef96f74de771e868b277453d6f21':
  Don't starve a BT ACL link with 0 xmit quota

9 years agoam 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota
Prerepa Viswanadham [Tue, 28 Oct 2014 23:49:28 +0000 (23:49 +0000)]
am 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota

* commit '472c2a7bb0ac070e596084f9422157f7872c6dca':
  Don't starve a BT ACL link with 0 xmit quota

9 years agoIncrement seq before adding to packet in avdt_scb_hdl_write_req_no_frag
Matthew Xie [Tue, 28 Oct 2014 23:26:48 +0000 (23:26 +0000)]
Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag
automerge: 98ad505

* commit '98ad505f577599870cf0ae281a5d035e2e2453f9':
  Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

9 years agoMerge "Make sure now_us returns a value bigger than the previous one" into lmp-mr1-dev
Matthew Xie [Tue, 28 Oct 2014 22:39:14 +0000 (22:39 +0000)]
Merge "Make sure now_us returns a value bigger than the previous one" into lmp-mr1-dev

9 years agoMake sure now_us returns a value bigger than the previous one
Matthew Xie [Tue, 28 Oct 2014 18:05:26 +0000 (11:05 -0700)]
Make sure now_us returns a value bigger than the previous one

On some platforms clock_gettime may sometimes return a current
time that is earlier than a previous time. While it rarely
happens, we need cover the case anyway.

Bug: 18154020
Change-Id: I3846487aa45d0b11aeb63fa68af8826b864248fa

9 years agoLE: Make local privacy configurable
Andre Eisenbach [Mon, 27 Oct 2014 21:18:01 +0000 (21:18 +0000)]
LE: Make local privacy configurable
automerge: 3e0dc73

* commit '3e0dc7324e7b0127f9d15609bab395100a22098d':
  LE: Make local privacy configurable

9 years agoam 6fa7d957: Merge "Retry pairing if the device did not respond (page timeout)" into...
Prem Kumar [Sat, 25 Oct 2014 19:54:54 +0000 (19:54 +0000)]
am 6fa7d957: Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev automerge: 25249f7

* commit '6fa7d957a3ffe77120f9a3852a97c32182f80ed9':

9 years agoam 86ec3ba8: A2DP: Lowering maximum PCM frame limit to avoid audio breaks automerge...
Andre Eisenbach [Sat, 25 Oct 2014 19:54:54 +0000 (19:54 +0000)]
am 86ec3ba8: A2DP: Lowering maximum PCM frame limit to avoid audio breaks automerge: 01d102b

* commit '86ec3ba8f1eed2d449651ea836b4a26ea3e2c9ed':

9 years agoam 271168a5: am 9d8df2d1: Merge "LE: Serialize multiple connection parameter update...
Andre Eisenbach [Sat, 25 Oct 2014 19:54:53 +0000 (19:54 +0000)]
am 271168a5: am 9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests" into lmp-dev

* commit '271168a5897d49d5bcc6cd9ee0c8781fcd935656':

9 years agoam 51206f86: am d8586177: Merge "Implement GATT service cache" into lmp-dev
Andre Eisenbach [Sat, 25 Oct 2014 19:54:53 +0000 (19:54 +0000)]
am 51206f86: am d8586177: Merge "Implement GATT service cache" into lmp-dev

* commit '51206f861b77cf2efc2004cdfd50387edad08a55':

9 years agoam 69716b54: (-s ours) am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set...
Matthew Xie [Sat, 25 Oct 2014 19:54:52 +0000 (19:54 +0000)]
am 69716b54: (-s ours) am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

* commit '69716b54b9faf23709b185a13bca2955bff62fbf':

9 years agoam a9b72a8f: am 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_...
Matthew Xie [Sat, 25 Oct 2014 19:54:52 +0000 (19:54 +0000)]
am a9b72a8f: am 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

* commit 'a9b72a8fac0e455d849092b5a46d494729d4c252':

9 years agoam 4ad4c4b9: am 12ca0ec5: Merge "Added missing A2DP priority on java alarm service...
Andre Eisenbach [Sat, 25 Oct 2014 19:54:51 +0000 (19:54 +0000)]
am 4ad4c4b9: am 12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev

* commit '4ad4c4b997bd96ee09827b39a49fbbb3322690d1':

9 years agoam 2817e84e: am 1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetoot...
Andre Eisenbach [Sat, 25 Oct 2014 19:54:51 +0000 (19:54 +0000)]
am 2817e84e: am 1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"

* commit '2817e84e1a3401062bf94ac60f6ee7ee1af171fc':

9 years agoam 04d4c74e: am ebc38ac1: am ba2f6d99: (-s ours) Revert "anthias:17614185:Bluetooth...
Simon Wilson [Sat, 25 Oct 2014 19:54:50 +0000 (19:54 +0000)]
am 04d4c74e: am ebc38ac1: am ba2f6d99: (-s ours) Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer"

* commit '04d4c74e494bc0e23f7fd225b02b420f4069068a':

9 years agoam 5fd0cfaf: (-s ours) am 5f0196cc: am 46bfe63d: (-s ours) DO NOT MERGE AVRCP: Proper...
Mallikarjuna GB [Sat, 25 Oct 2014 19:54:50 +0000 (19:54 +0000)]
am 5fd0cfaf: (-s ours) am 5f0196cc: am 46bfe63d: (-s ours) DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet

* commit '5fd0cfafa6237e33b551ec81f4413e5c590b08ad':

9 years agoam 57787fe9: am 9c9c4bf7: am c1ccb0d9: (-s ours) anthias:17614185:Bluetooth: Getbuf...
Maggie_Lee [Sat, 25 Oct 2014 19:54:49 +0000 (19:54 +0000)]
am 57787fe9: am 9c9c4bf7: am c1ccb0d9: (-s ours) anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer

* commit '57787fe919277f4fb0f226f5c639919b576ee89a':

9 years agoam 86204201: am de898558: Merge "Fix an "array index out of bound" bug for RPA."...
Wei Wang [Sat, 25 Oct 2014 19:54:49 +0000 (19:54 +0000)]
am 86204201: am de898558: Merge "Fix an "array index out of bound" bug for RPA." into lmp-dev

* commit '862042012c11e9cbbcc43088069ef4b9b5a7f48e':

9 years agoam b59fbf1b: am 19a8f456: Merge "Raise A2DP threat priority to avoid music breaks...
Andre Eisenbach [Sat, 25 Oct 2014 19:54:48 +0000 (19:54 +0000)]
am b59fbf1b: am 19a8f456: Merge "Raise A2DP threat priority to avoid music breaks" into lmp-dev

* commit 'b59fbf1bd96a6abacdc655fb32cea86f53a7a825':

9 years agoam 87b9ca22: am d5aa2475: LE: Peer device\'s latest RPA is not being applied
Satya Calloji [Sat, 25 Oct 2014 19:54:48 +0000 (19:54 +0000)]
am 87b9ca22: am d5aa2475: LE: Peer device\'s latest RPA is not being applied

* commit '87b9ca2209c0ee8a9b436e20dfd147115783c05e':

9 years agoam bf1b3520: am 4baec1a8: Merge "Remove HOGP device from background connection list...
Matthew Xie [Sat, 25 Oct 2014 19:54:47 +0000 (19:54 +0000)]
am bf1b3520: am 4baec1a8: Merge "Remove HOGP device from background connection list" into lmp-dev

* commit 'bf1b35201c1f60cebea6c0fc496b91a18ec3b280':

9 years agoam 4e3572b5: am 1cd92393: Null check for irk entry
Priti Aghera [Sat, 25 Oct 2014 19:54:47 +0000 (19:54 +0000)]
am 4e3572b5: am 1cd92393: Null check for irk entry

* commit '4e3572b5f7a2abb6bb37fa1f50505f41dca13938':

9 years agoam 597c288d: am 03cb1ad1: Merge "Enable flow control when tx buffer is full and peer...
Matthew Xie [Sat, 25 Oct 2014 19:54:46 +0000 (19:54 +0000)]
am 597c288d: am 03cb1ad1: Merge "Enable flow control when tx buffer is full and peer stuck in receiving" into lmp-dev

* commit '597c288dadd24679a059474aff85bf982e2add69':

9 years agoam 9a12a619: am 8b52f5f2: Merge "Suppress the warning compiled with gcc-4.9"
Elliott Hughes [Sat, 25 Oct 2014 19:54:45 +0000 (19:54 +0000)]
am 9a12a619: am 8b52f5f2: Merge "Suppress the warning compiled with gcc-4.9"

* commit '9a12a619b2da9999159027c1c435c3b24a8e2b37':

9 years agoam 9a789ea6: am 94c31e55: Merge "Fix of memset usage"
Elliott Hughes [Sat, 25 Oct 2014 19:54:45 +0000 (19:54 +0000)]
am 9a789ea6: am 94c31e55: Merge "Fix of memset usage"

* commit '9a789ea66ae60b38139c3360229f3c709eb7b9b3':

9 years agoam a169432c: am 3f24f460: All 00 mac address with advt
Satya Calloji [Sat, 25 Oct 2014 19:54:44 +0000 (19:54 +0000)]
am a169432c: am 3f24f460: All 00 mac address with advt

* commit 'a169432c3bb01bf0bbcc1837f7965636b0ac4bde':

9 years agoam 42009e23: am d1e6922c: Check userial fd before reading
Chris Manton [Sat, 25 Oct 2014 19:54:44 +0000 (19:54 +0000)]
am 42009e23: am d1e6922c: Check userial fd before reading

* commit '42009e230dfa39b85cf2356ccfd14bdbe495b81a':

9 years agoam 09ade5ef: am 13e916d7: Merge "Add ability to preserve existing snoop log" into...
Andre Eisenbach [Sat, 25 Oct 2014 19:54:43 +0000 (19:54 +0000)]
am 09ade5ef: am 13e916d7: Merge "Add ability to preserve existing snoop log" into lmp-dev

* commit '09ade5ef753d4de7c485aa3f681f8f5cdfb637af':

9 years agoam 4358907b: am 303d4ac5: Merge "For pairing over le transport, set default device...
Matthew Xie [Sat, 25 Oct 2014 19:54:43 +0000 (19:54 +0000)]
am 4358907b: am 303d4ac5: Merge "For pairing over le transport, set default device type and address type" into lmp-dev

* commit '4358907bb4fbbfb76cca22076b5e7c440cc90c9d':

9 years agoam 0fafefe2: am c918d087: Document LE IO capabilities and use BR/EDR constant for LE
Andre Eisenbach [Sat, 25 Oct 2014 19:54:42 +0000 (19:54 +0000)]
am 0fafefe2: am c918d087: Document LE IO capabilities and use BR/EDR constant for LE

* commit '0fafefe2b716aa168e8d853abf99c236702dc4ad':

9 years agoLE: Make local privacy configurable
Andre Eisenbach [Fri, 24 Oct 2014 16:55:34 +0000 (09:55 -0700)]
LE: Make local privacy configurable

Bug: 17753401
Change-Id: I288ea8b6194d91d18485d0f3f1bbf997f97a26dd

9 years agoDon't starve a BT ACL link with 0 xmit quota
Prerepa Viswanadham [Thu, 23 Oct 2014 20:50:57 +0000 (13:50 -0700)]
Don't starve a BT ACL link with 0 xmit quota

With new link management of controller buffers between
different ACL connections, it is possible that a ACL
conn would get 0 buffers - thus no profile can run.
This affects classic and LE ACL connections.

This work around allows a floor of 1 buffer as the
floor for all connection, irrespective of controller
capability.

Bug: 17976311
Change-Id: I7cd0d34af47c441c5ea7f2b836b591a4fec62ad1

9 years agoam f8938276: am 5e808468: LE: Do not remove bond on encryption failure
Andre Eisenbach [Wed, 22 Oct 2014 21:12:58 +0000 (21:12 +0000)]
am f8938276: am 5e808468: LE: Do not remove bond on encryption failure

* commit 'f89382760380cc3a2dd5d56366344eed2c00e561':
  LE: Do not remove bond on encryption failure

9 years agoam b94c47a5: am 433fe016: Cache HOGP HID report map
Chaojing Sun [Wed, 22 Oct 2014 21:12:57 +0000 (21:12 +0000)]
am b94c47a5: am 433fe016: Cache HOGP HID report map

* commit 'b94c47a5407b29bf3bcb8d3c5f94773d9697ce50':
  Cache HOGP HID report map

9 years agoam f4d88b93: am 25249f76: Merge "Retry pairing if the device did not respond (page...
Prem Kumar [Wed, 22 Oct 2014 21:12:56 +0000 (21:12 +0000)]
am f4d88b93: am 25249f76: Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev

* commit 'f4d88b93db3796b3c0915d8068ea14e60913f377':
  Retry pairing if the device did not respond (page timeout)

9 years agoam 6b5262a6: am 01d102b3: A2DP: Lowering maximum PCM frame limit to avoid audio breaks
Andre Eisenbach [Wed, 22 Oct 2014 21:12:56 +0000 (21:12 +0000)]
am 6b5262a6: am 01d102b3: A2DP: Lowering maximum PCM frame limit to avoid audio breaks

* commit '6b5262a6943444848a377aa882f8be91449211d1':
  A2DP: Lowering maximum PCM frame limit to avoid audio breaks

9 years agoam 5e808468: LE: Do not remove bond on encryption failure
Andre Eisenbach [Wed, 22 Oct 2014 06:12:53 +0000 (06:12 +0000)]
am 5e808468: LE: Do not remove bond on encryption failure

* commit '5e808468e0667a6a2a8a1e6de80efbc4f42fa0f0':
  LE: Do not remove bond on encryption failure

9 years agoLE: Do not remove bond on encryption failure
Andre Eisenbach [Tue, 21 Oct 2014 19:37:53 +0000 (12:37 -0700)]
LE: Do not remove bond on encryption failure

If the encryption fails during the re-connection process with a
previously paired LE device, the pairing is removed. Thus, a single
connection failure could lead to the device be unpaired.

This patch prevents unpairing when encryption fails.

Additionally, the IRK is restored from NV ram to fix reconnection to
dual-mode devices.

Bug: 18072300
Change-Id: I077a16d0715fdaa07b95b1c664c18bd839754896

9 years agoam 433fe016: Cache HOGP HID report map
Chaojing Sun [Tue, 21 Oct 2014 21:42:57 +0000 (21:42 +0000)]
am 433fe016: Cache HOGP HID report map

* commit '433fe016392c7ae003033530f1b3994f2ddad313':
  Cache HOGP HID report map

9 years agoam 25249f76: Merge "Retry pairing if the device did not respond (page timeout)" into...
Prem Kumar [Tue, 21 Oct 2014 21:42:56 +0000 (21:42 +0000)]
am 25249f76: Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev

* commit '25249f7663d75244b5a2abcac08e301d584fcd8d':
  Retry pairing if the device did not respond (page timeout)

9 years agoam 01d102b3: A2DP: Lowering maximum PCM frame limit to avoid audio breaks
Andre Eisenbach [Tue, 21 Oct 2014 21:42:56 +0000 (21:42 +0000)]
am 01d102b3: A2DP: Lowering maximum PCM frame limit to avoid audio breaks

* commit '01d102b3b187ab0d24050c1e12f96e6ee1ce50be':
  A2DP: Lowering maximum PCM frame limit to avoid audio breaks

9 years agoCache HOGP HID report map
Chaojing Sun [Fri, 17 Oct 2014 02:22:05 +0000 (19:22 -0700)]
Cache HOGP HID report map

HID reports from a bonded device can be missed when Bluetooth is
restarted HOGP report discovery is still active. Caching the
report information and loading it back when the stack resets
will ensure incoming HID reports can be processed immediately.

Bug: 17999991
Change-Id: I4608935f8749537d6b05625b894445a21f844ee0

9 years agoam 72833a19: Remove spammy log information for BLE scan.
Wei Wang [Mon, 20 Oct 2014 18:28:25 +0000 (18:28 +0000)]
am 72833a19: Remove spammy log information for BLE scan.

* commit '72833a19b228fbe5e1931255b325edf0bce0b994':
  Remove spammy log information for BLE scan.

9 years agoMerge "Retry pairing if the device did not respond (page timeout)" into lmp-dev
Prem Kumar [Sat, 18 Oct 2014 19:44:13 +0000 (19:44 +0000)]
Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev
automerge: 25249f7

* commit '25249f7663d75244b5a2abcac08e301d584fcd8d':
  Retry pairing if the device did not respond (page timeout)

9 years agoA2DP: Lowering maximum PCM frame limit to avoid audio breaks
Andre Eisenbach [Sat, 18 Oct 2014 19:44:10 +0000 (19:44 +0000)]
A2DP: Lowering maximum PCM frame limit to avoid audio breaks
automerge: 01d102b

* commit '01d102b3b187ab0d24050c1e12f96e6ee1ce50be':
  A2DP: Lowering maximum PCM frame limit to avoid audio breaks

9 years agoMerge "Retry pairing if the device did not respond (page timeout)" into lmp-dev
Prem Kumar [Sat, 18 Oct 2014 19:21:05 +0000 (19:21 +0000)]
Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev

9 years agoRemove spammy log information for BLE scan.
Wei Wang [Fri, 17 Oct 2014 03:26:44 +0000 (20:26 -0700)]
Remove spammy log information for BLE scan.

Bug:17574681
Change-Id: Ia33d0a845d5a4ac5aa58bd32529aeae60db4fd49

9 years agoA2DP: Lowering maximum PCM frame limit to avoid audio breaks
Andre Eisenbach [Fri, 17 Oct 2014 19:52:58 +0000 (12:52 -0700)]
A2DP: Lowering maximum PCM frame limit to avoid audio breaks

Some car kits (notably Renesas car kits used in Nissan/Infiniti models)
will throttle incoming A2DP frames if too many frames are sent at once.
This patch lowers the maximum number of frames sent per tick to not
overwhelm the remote device.

Bug: 17880920
Change-Id: I7bfbba625405c96159d1c94eebd8dc498f100daa

9 years agoRetry pairing if the device did not respond (page timeout)
Andre Eisenbach [Tue, 14 Oct 2014 21:29:19 +0000 (14:29 -0700)]
Retry pairing if the device did not respond (page timeout)

Implements a "blacklist" identifying troublesome remote devices which
may require multiple pairing attempts to succeed.

Change-Id: I11b6b7da7230e37fbd5ec4c07cd38b30dc12b40e

9 years agoam 71653806: am 9d8df2d1: Merge "LE: Serialize multiple connection parameter update...
Andre Eisenbach [Thu, 16 Oct 2014 18:55:41 +0000 (18:55 +0000)]
am 71653806: am 9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests" into lmp-dev

* commit '716538065987e2bd6bd27698a6bd31990753caf0':
  LE: Serialize multiple connection parameter update requests

9 years agoam 9c56a399: am d8586177: Merge "Implement GATT service cache" into lmp-dev
Andre Eisenbach [Thu, 16 Oct 2014 18:55:41 +0000 (18:55 +0000)]
am 9c56a399: am d8586177: Merge "Implement GATT service cache" into lmp-dev

* commit '9c56a3995a66d3285eca1a2b902236ead9d034fb':
  Implement GATT service cache

9 years agoam 9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests"...
Andre Eisenbach [Thu, 16 Oct 2014 06:17:42 +0000 (06:17 +0000)]
am 9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests" into lmp-dev

* commit '9d8df2d1c4ad40fa49e7e1c1031421d8a194d927':
  LE: Serialize multiple connection parameter update requests

9 years agoam d8586177: Merge "Implement GATT service cache" into lmp-dev
Andre Eisenbach [Thu, 16 Oct 2014 06:17:41 +0000 (06:17 +0000)]
am d8586177: Merge "Implement GATT service cache" into lmp-dev

* commit 'd85861779fb900b1c8ac2c6597a3cc111f161dcb':
  Implement GATT service cache

9 years agoam 9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests"...
Andre Eisenbach [Thu, 16 Oct 2014 06:17:34 +0000 (06:17 +0000)]
am 9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests" into lmp-dev

* commit '9d8df2d1c4ad40fa49e7e1c1031421d8a194d927':
  LE: Serialize multiple connection parameter update requests

9 years agoam d8586177: Merge "Implement GATT service cache" into lmp-dev
Andre Eisenbach [Thu, 16 Oct 2014 06:17:34 +0000 (06:17 +0000)]
am d8586177: Merge "Implement GATT service cache" into lmp-dev

* commit 'd85861779fb900b1c8ac2c6597a3cc111f161dcb':
  Implement GATT service cache

9 years agoMerge "LE: Serialize multiple connection parameter update requests" into lmp-dev
Andre Eisenbach [Thu, 16 Oct 2014 06:14:36 +0000 (06:14 +0000)]
Merge "LE: Serialize multiple connection parameter update requests" into lmp-dev

9 years agoMerge "Implement GATT service cache" into lmp-dev
Andre Eisenbach [Thu, 16 Oct 2014 06:14:17 +0000 (06:14 +0000)]
Merge "Implement GATT service cache" into lmp-dev

9 years agoImplement GATT service cache
Andre Eisenbach [Wed, 15 Oct 2014 22:41:52 +0000 (15:41 -0700)]
Implement GATT service cache

When trying to reconnect a previously paired device, notifications may
be sent by the remote device before the characteristic handles have been
discovered. Thus notifications will be lost.

This patch adds a non-volatile attribute cache that allows attribute
handles to be restored before notifications are received.

Bug: 17999991
Change-Id: I97faefbc6a2fed86cbce7f64d620ed03944d89b2

9 years agoam 269eb418: am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in...
Matthew Xie [Thu, 16 Oct 2014 00:04:09 +0000 (00:04 +0000)]
am 269eb418: am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

* commit '269eb4180d2e8cd82eac3e21f73cf8aae26b910b':
  DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

9 years agoam f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject...
Matthew Xie [Wed, 15 Oct 2014 23:57:28 +0000 (23:57 +0000)]
am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

* commit 'f777d24c24b3c1ff309151cf2bc21e98559cbf56':
  DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

9 years agoam 38e70739: am 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_...
Matthew Xie [Wed, 15 Oct 2014 23:56:11 +0000 (23:56 +0000)]
am 38e70739: am 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

* commit '38e7073988898cc4878c68319ff8fa4a4b85ec7e':
  Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

9 years agoam f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject...
Matthew Xie [Wed, 15 Oct 2014 23:39:49 +0000 (23:39 +0000)]
am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

* commit 'f777d24c24b3c1ff309151cf2bc21e98559cbf56':
  DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

9 years agoam 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write...
Matthew Xie [Wed, 15 Oct 2014 23:15:10 +0000 (23:15 +0000)]
am 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

* commit '4a35476c4ade75b985fa46f1ab82dad92a6b0810':
  Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

9 years agoam 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message...
Matthew Xie [Wed, 15 Oct 2014 20:09:29 +0000 (20:09 +0000)]
am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

* commit '595bcb4c72aaa2a9a54a23b127dd5fa9842876ca':
  DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

9 years agoDO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2
Matthew Xie [Mon, 13 Oct 2014 20:50:29 +0000 (13:50 -0700)]
DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

AVDTP SPEC 1.3 set sig_id in gerneral reject message. But current stack
is on AVDTP 1.2, we need set the field to be 0.
Setting sig_id would fail PTS test TP/SIG/SMG/BI-28-C

Bug: 17892440
Change-Id: I2037aae299eab15864fc7b53ada7f49c0f34b9c5

9 years agoam 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write...
Matthew Xie [Wed, 15 Oct 2014 19:22:09 +0000 (19:22 +0000)]
am 4a35476c: am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

* commit '4a35476c4ade75b985fa46f1ab82dad92a6b0810':
  Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

9 years agoam 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag
Matthew Xie [Wed, 15 Oct 2014 19:12:36 +0000 (19:12 +0000)]
am 98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

* commit '98ad505f577599870cf0ae281a5d035e2e2453f9':
  Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

9 years agoLE: Serialize multiple connection parameter update requests
Chaojing Sun [Wed, 8 Oct 2014 00:07:05 +0000 (17:07 -0700)]
LE: Serialize multiple connection parameter update requests

Bluetooth controllers do not allow multiple connection parameter
updates where there is one outstanding. This requires serializing
all connection parameter update requests and send the latest
request when the pending one is finished.

Bug: 17979666
Change-Id: Ic49bd89a4ded28014d74b40e67f2a3ea490b9ef7

9 years agoIncrement seq before adding to packet in avdt_scb_hdl_write_req_no_frag
Matthew Xie [Mon, 13 Oct 2014 21:50:30 +0000 (14:50 -0700)]
Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

Bluetooth Certification Test case TP/TRA/BTR/BV-01-C for Basic
Transport Service Support fails. The failure is because the PTS
is expecting the first RTP Media Frame to have a sequence number
of 1. But metallica sends it as 0.
bug 17893538

Change-Id: Idfe7ae382c3764616dab4733cdf83b1627b8b3c9

9 years agoam 494b3bf7: Merge "Add support of advertising through standard instance.(4/4)" into...
Wei Wang [Tue, 14 Oct 2014 17:48:55 +0000 (17:48 +0000)]
am 494b3bf7: Merge "Add support of advertising through standard instance.(4/4)" into lmp-sprout-dev

* commit '494b3bf7403723560709949f8c2d337d6d63310a':
  Add support of advertising through standard instance.(4/4)

9 years agoMerge "Add support of advertising through standard instance.(4/4)" into lmp-sprout-dev
Wei Wang [Mon, 13 Oct 2014 23:02:31 +0000 (23:02 +0000)]
Merge "Add support of advertising through standard instance.(4/4)" into lmp-sprout-dev

9 years agoam 12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev
Andre Eisenbach [Fri, 10 Oct 2014 23:14:26 +0000 (23:14 +0000)]
am 12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev

* commit '12ca0ec54796e31405a880de6675015c88857158':
  Added missing A2DP priority on java alarm service

9 years agoam 1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled...
Andre Eisenbach [Fri, 10 Oct 2014 23:14:26 +0000 (23:14 +0000)]
am 1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"

* commit '1fbddc8faacde61190df31a8e6ea9142feb4bc88':
  Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"

9 years agoam 12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev
Andre Eisenbach [Fri, 10 Oct 2014 18:16:56 +0000 (18:16 +0000)]
am 12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev

* commit '12ca0ec54796e31405a880de6675015c88857158':
  Added missing A2DP priority on java alarm service

9 years agoam 1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled...
Andre Eisenbach [Fri, 10 Oct 2014 18:16:55 +0000 (18:16 +0000)]
am 1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"

* commit '1fbddc8faacde61190df31a8e6ea9142feb4bc88':
  Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"

9 years agoMerge "Added missing A2DP priority on java alarm service" into lmp-dev
Andre Eisenbach [Fri, 10 Oct 2014 18:13:13 +0000 (18:13 +0000)]
Merge "Added missing A2DP priority on java alarm service" into lmp-dev

9 years agoAdded missing A2DP priority on java alarm service
Mattias Agren [Wed, 8 Oct 2014 23:16:12 +0000 (01:16 +0200)]
Added missing A2DP priority on java alarm service

Running GKI timer engine via JAVA alarm service was causing severe
timer preemption at times which affects A2DP media task timer. This in
turn was stressing the compensation logic towards UIPC resulting in
very bursty reads of up to 40 UIPC frames at a time. This led to
instabilities on the UIPC pipe and trickled upwards in audio framework.
Inclusion of java alarm thread in A2DP high priority thread list results
in a much smoother data flow for entire A2DP data path and improved
audio quality.

Bug: 17520043
Change-Id: I7cea6ec64aa5b973b5fff767389a8827e681619e

9 years agoRevert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"
Andre Eisenbach [Fri, 10 Oct 2014 16:11:27 +0000 (09:11 -0700)]
Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"

This reverts commit a934f018b6c6a7eda4662a60f2f04828afc3ab77.

This patch caused various headset audio break issues and slow
reconnections on headsets like the Bose AE2W.

Based on the original bug under which this patch was merged
(b/10648781) it is unlikely that this bug even fixed the
issue it was meant to address.

Bug: 17520043
Change-Id: I39bb9abbf5735abff25b5257425c34972287dc27

9 years agoam ebc38ac1: am ba2f6d99: (-s ours) Revert "anthias:17614185:Bluetooth: Getbuf return...
Simon Wilson [Thu, 9 Oct 2014 22:23:44 +0000 (22:23 +0000)]
am ebc38ac1: am ba2f6d99: (-s ours) Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer"

* commit 'ebc38ac1acf8629d5a641c4687dd97ff1cf768e0':
  Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer"