OSDN Git Service
Simon Wilson [Mon, 3 Nov 2014 23:10:00 +0000 (23:10 +0000)]
am
b3cebcbc: am
020cccca: am
5fe98634: am
ba2f6d99: Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge:
8403c6d
automerge:
fd3e332
* commit '
fd3e33296c5fec073109d7b6200302ba5809311a':
Mallikarjuna GB [Mon, 3 Nov 2014 22:50:21 +0000 (22:50 +0000)]
am
aa7a28a3: am
36eac517: am
27c93b25: am
46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge:
f9336d3 -s ours
automerge:
4504e77 -s ours
* commit '
4504e778983c024c51b2a74cc039ff6e7e7608ad':
Maggie_Lee [Mon, 3 Nov 2014 22:50:19 +0000 (22:50 +0000)]
am
9e7ad87f: am
9624c4d6: am
36ba410e: am
c1ccb0d9: anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge:
0e74efe
automerge:
efe6d10
* commit '
efe6d107f91a5bfce2e6595cdaf51a934e9bee05':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
Eric Laurent [Fri, 31 Oct 2014 00:24:22 +0000 (00:24 +0000)]
am
ade2c70e: am
59f80103: Merge "audio HAL: remove misleading error log" into lmp-mr1-dev
* commit '
ade2c70e3a46e5f1c189eb3cf1e7311605d619f8':
audio HAL: remove misleading error log
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
Prerepa Viswanadham [Thu, 30 Oct 2014 19:05:59 +0000 (19:05 +0000)]
am
cf359a5c: am
903285cb: am
472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota automerge:
3a14106
* commit '
cf359a5c4fa891355f8c5ea373fcb49af0cc4f6d':
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
Eric Laurent [Thu, 30 Oct 2014 16:03:11 +0000 (16:03 +0000)]
Merge "audio HAL: remove misleading error log" into lmp-mr1-dev
Matthew Xie [Thu, 30 Oct 2014 14:51:06 +0000 (14:51 +0000)]
am
41388b8a: Merge "Make sure now_us returns a value bigger than the previous one" into lmp-mr1-dev
automerge:
0cb931a
* commit '
0cb931a39da4fc60744fa923951aae5c2339bff5':
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
Eric Laurent [Thu, 30 Oct 2014 00:17:31 +0000 (17:17 -0700)]
audio HAL: remove misleading error log
Bug:
17916028.
Change-Id: I4badb9208eeb973a08b4f8463ee287f6bfb3dd01
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
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
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
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
Andre Eisenbach [Tue, 28 Oct 2014 07:13:15 +0000 (07:13 +0000)]
am
d27b3089: LE: Make local privacy configurable automerge:
3e0dc73
* commit '
d27b30890beab706898064b925073d78b3f82048':
LE: 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
Prem Kumar [Sun, 26 Oct 2014 00:50:00 +0000 (00:50 +0000)]
am
17bbb6e3: am
6fa7d957: Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev automerge:
25249f7
* commit '
17bbb6e3468bd85f627bb559970419706bc59471':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:59 +0000 (00:49 +0000)]
am
d712f06b: am
86ec3ba8: A2DP: Lowering maximum PCM frame limit to avoid audio breaks automerge:
01d102b
* commit '
d712f06b63c18b12514b24c959445e28fbabf842':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:59 +0000 (00:49 +0000)]
am
c15a5aaa: am
271168a5: am
9d8df2d1: Merge "LE: Serialize multiple connection parameter update requests" into lmp-dev
* commit '
c15a5aaa363aca042359f125eee8fe0302f77b2c':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:58 +0000 (00:49 +0000)]
am
8cc2a0cc: am
51206f86: am
d8586177: Merge "Implement GATT service cache" into lmp-dev
* commit '
8cc2a0cc32dbcbe6b59694580519a585a660ca3a':
Matthew Xie [Sun, 26 Oct 2014 00:49:58 +0000 (00:49 +0000)]
am
09030300: (-s ours) 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 '
09030300acb73a33a9e3e0ac3908b0e52eae4f57':
Matthew Xie [Sun, 26 Oct 2014 00:49:57 +0000 (00:49 +0000)]
am
babf8da1: am
a9b72a8f: am
4a35476c: am
98ad505f: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag
* commit '
babf8da18740aea3bba5feb7148184ea8ed1b6be':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:57 +0000 (00:49 +0000)]
am
a0786697: am
4ad4c4b9: am
12ca0ec5: Merge "Added missing A2DP priority on java alarm service" into lmp-dev
* commit '
a0786697d82f5deba47ce81488c150c3a79f2288':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:56 +0000 (00:49 +0000)]
am
4dd2d146: am
2817e84e: am
1fbddc8f: Revert "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on"
* commit '
4dd2d146da53cc16a5dc622a99fa7bf24748df76':
Simon Wilson [Sun, 26 Oct 2014 00:49:56 +0000 (00:49 +0000)]
am
e597aa06: am
04d4c74e: am
ebc38ac1: am
ba2f6d99: (-s ours) Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer"
* commit '
e597aa068d470ebc4e603cf2da8380cf01090d86':
Mallikarjuna GB [Sun, 26 Oct 2014 00:49:55 +0000 (00:49 +0000)]
am
da2bc9e1: (-s ours) am
5fd0cfaf: (-s ours) am
5f0196cc: am
46bfe63d: (-s ours) DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet
* commit '
da2bc9e121936f6d61990b3b4d26c5312af3b78c':
Maggie_Lee [Sun, 26 Oct 2014 00:49:55 +0000 (00:49 +0000)]
am
b44f0135: am
57787fe9: am
9c9c4bf7: am
c1ccb0d9: (-s ours) anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
* commit '
b44f013580aed9988fd425ab5e791882c925b760':
Wei Wang [Sun, 26 Oct 2014 00:49:54 +0000 (00:49 +0000)]
am
46b3b696: am
86204201: am
de898558: Merge "Fix an "array index out of bound" bug for RPA." into lmp-dev
* commit '
46b3b6968e3804e193966b67e91cc575b9dec739':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:54 +0000 (00:49 +0000)]
am
f483b9cb: am
b59fbf1b: am
19a8f456: Merge "Raise A2DP threat priority to avoid music breaks" into lmp-dev
* commit '
f483b9cbfeb3ee3d043b91b576f90c8d33f48858':
Satya Calloji [Sun, 26 Oct 2014 00:49:53 +0000 (00:49 +0000)]
am
c93878d7: am
87b9ca22: am
d5aa2475: LE: Peer device\'s latest RPA is not being applied
* commit '
c93878d7216ac8b2c0296284ce92d8d0f5f84553':
Matthew Xie [Sun, 26 Oct 2014 00:49:53 +0000 (00:49 +0000)]
am
21967ff3: am
bf1b3520: am
4baec1a8: Merge "Remove HOGP device from background connection list" into lmp-dev
* commit '
21967ff32b236d7e4e6c9eaa658bc03e9265613d':
Priti Aghera [Sun, 26 Oct 2014 00:49:52 +0000 (00:49 +0000)]
Matthew Xie [Sun, 26 Oct 2014 00:49:52 +0000 (00:49 +0000)]
am
7087bbe9: am
597c288d: am
03cb1ad1: Merge "Enable flow control when tx buffer is full and peer stuck in receiving" into lmp-dev
* commit '
7087bbe9624045abd2d509c5c8fbcf9e71da5fa4':
Elliott Hughes [Sun, 26 Oct 2014 00:49:52 +0000 (00:49 +0000)]
am
04d2b3ab: am
9a12a619: am
8b52f5f2: Merge "Suppress the warning compiled with gcc-4.9"
* commit '
04d2b3abc2580cc1565efc8fe7a85a3fa1452120':
Elliott Hughes [Sun, 26 Oct 2014 00:49:51 +0000 (00:49 +0000)]
Satya Calloji [Sun, 26 Oct 2014 00:49:51 +0000 (00:49 +0000)]
Chris Manton [Sun, 26 Oct 2014 00:49:50 +0000 (00:49 +0000)]
Andre Eisenbach [Sun, 26 Oct 2014 00:49:50 +0000 (00:49 +0000)]
am
4942a6af: am
09ade5ef: am
13e916d7: Merge "Add ability to preserve existing snoop log" into lmp-dev
* commit '
4942a6afc663cc3736f082ecc4f869ba59230f14':
Matthew Xie [Sun, 26 Oct 2014 00:49:49 +0000 (00:49 +0000)]
am
a99f9b92: am
4358907b: am
303d4ac5: Merge "For pairing over le transport, set default device type and address type" into lmp-dev
* commit '
a99f9b920282db5c60f888e82d8f66f4d5dd62c9':
Andre Eisenbach [Sun, 26 Oct 2014 00:49:48 +0000 (00:49 +0000)]
am
a6d3cc4f: am
0fafefe2: am
c918d087: Document LE IO capabilities and use BR/EDR constant for LE
* commit '
a6d3cc4f833b8c5d46b84a942787265730c9842d':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
Priti Aghera [Sat, 25 Oct 2014 19:54:47 +0000 (19:54 +0000)]
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':
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':
Elliott Hughes [Sat, 25 Oct 2014 19:54:45 +0000 (19:54 +0000)]
Satya Calloji [Sat, 25 Oct 2014 19:54:44 +0000 (19:54 +0000)]
Chris Manton [Sat, 25 Oct 2014 19:54:44 +0000 (19:54 +0000)]
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':
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':
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':
Andre Eisenbach [Fri, 24 Oct 2014 16:55:34 +0000 (09:55 -0700)]
LE: Make local privacy configurable
Bug:
17753401
Change-Id: I288ea8b6194d91d18485d0f3f1bbf997f97a26dd
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
Andre Eisenbach [Wed, 22 Oct 2014 21:22:54 +0000 (21:22 +0000)]
am
e455d394: am
f8938276: am
5e808468: LE: Do not remove bond on encryption failure
* commit '
e455d394478e58330aabcbc803e62f1aade45670':
LE: Do not remove bond on encryption failure
Chaojing Sun [Wed, 22 Oct 2014 21:22:54 +0000 (21:22 +0000)]
am
1c020326: am
b94c47a5: am
433fe016: Cache HOGP HID report map
* commit '
1c020326c12a6e2dac849c6bde9a366c26157a8e':
Cache HOGP HID report map
Prem Kumar [Wed, 22 Oct 2014 21:22:53 +0000 (21:22 +0000)]
am
758c559e: am
f4d88b93: am
25249f76: Merge "Retry pairing if the device did not respond (page timeout)" into lmp-dev
* commit '
758c559e0ffcf19dfd5e63ce775a751746935e11':
Retry pairing if the device did not respond (page timeout)
Andre Eisenbach [Wed, 22 Oct 2014 21:22:53 +0000 (21:22 +0000)]
am
52b851f1: am
6b5262a6: am
01d102b3: A2DP: Lowering maximum PCM frame limit to avoid audio breaks
* commit '
52b851f106f4b298395a8d38aa54316a7c9dd244':
A2DP: Lowering maximum PCM frame limit to avoid audio breaks
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
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
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)
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
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
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
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
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)
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
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
Wei Wang [Mon, 20 Oct 2014 18:35:49 +0000 (18:35 +0000)]
am
066c53da: am
72833a19: Remove spammy log information for BLE scan.
* commit '
066c53dac00b90ede10311a65fff4378747fb75d':
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.
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)
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
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
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
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
OSDN Git Service
