OSDN Git Service
Andre Eisenbach [Mon, 30 May 2016 23:23:11 +0000 (16:23 -0700)]
resolve merge conflicts of
934747d to nyc-dev-plus-aosp
Change-Id: Ifea8e5daf03ae684ad22e0dc790ae1bd26ba0035
Ayan Ghosh [Mon, 30 May 2016 23:09:24 +0000 (23:09 +0000)]
Limit number of SBC frames to fit into single MTU
am:
e9a52af36d
* commit '
e9a52af36d087ea68ec7ba5ed3f25c24fb3cdf64':
Limit number of SBC frames to fit into single MTU
Change-Id: Ia96d418dfa7968981e1585f7d4f078035c5a317b
Ayan Ghosh [Mon, 11 Nov 2013 13:55:16 +0000 (19:25 +0530)]
Limit number of SBC frames to fit into single MTU
- Calculate number of SBC frames to fit into single MTU for EDR capable
remote devices. This makes sure the maximum utilization of the
available bandwidth, keeping the bitrate at high quality.
- This change helps to address the discrepancy seen with a few available
2 Mbps headsets which set the AVDTP media MTU size greater than the
2DH5 packet payload size which eventually forces AVDTP packets to get
fragmented in the controller. This change ensures packing of the SBC
frames in a way that AVDTP packet size fits within the 2DH5 payload
size.
- As packet size is restricted to meet the required bit rate more than
one AVDTP packet can be sent to the controller in a given iteration
based on the bit rate requirement.
Bug:
24875861
Change-Id: Icae7656ad563bbbdef65ecbfa15a89b26cf9edb2
Pavlin Radoslavov [Fri, 27 May 2016 20:44:09 +0000 (20:44 +0000)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
am:
6834570262
* commit '
6834570262116974a176cd8598b6d0ca6d031aca':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: I406540a4a8fdf864717cd3ebf89ca814ba1ba991
Pavlin Radoslavov [Fri, 27 May 2016 20:19:18 +0000 (20:19 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE" am:
692c63af2e
am:
b6426a8d3c
* commit '
b6426a8d3ca4ccc036f5130b36f90a8db84d4b78':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: I220d5c502dad4f08c8a7631e74ac7c4ad4d78f0d
Pavlin Radoslavov [Fri, 27 May 2016 20:12:40 +0000 (20:12 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE"
am:
692c63af2e
* commit '
692c63af2e1a8adc5bb98084b16e26ba8445ecfe':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: Id962d5c6fac28fd352ca0f4b191a86c42460cba2
Treehugger Robot [Fri, 27 May 2016 20:01:16 +0000 (20:01 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE"
Chih-Hung Hsieh [Fri, 27 May 2016 19:31:37 +0000 (19:31 +0000)]
Fix misc-macro-parentheses warnings in embdrv/sbc. am:
7b7b057828
am:
89ebdc41bf
* commit '
89ebdc41bf3ab8f285ed34dde63a6f628bd94aa6':
Fix misc-macro-parentheses warnings in embdrv/sbc.
Change-Id: I723d7868ddeb7513dec76ffa503419f9ebdf699a
Chih-Hung Hsieh [Fri, 27 May 2016 19:26:25 +0000 (19:26 +0000)]
Fix misc-macro-parentheses warnings in embdrv/sbc.
am:
7b7b057828
* commit '
7b7b0578285281c762bd52255072cb34800ec7ea':
Fix misc-macro-parentheses warnings in embdrv/sbc.
Change-Id: Ifd3ad6cfb1b0f12230d8367f9cf2a8b84c1b7fd9
Pavlin Radoslavov [Fri, 27 May 2016 19:07:06 +0000 (12:07 -0700)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Bug:
28614494
Change-Id: I3f4a923f9e14faef57b2d694bfc253fd10749414
(cherry picked from commit
7496372239773b7121359a34291681b749beda5f)
Pavlin Radoslavov [Fri, 27 May 2016 19:07:06 +0000 (12:07 -0700)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Bug:
28614494
Change-Id: I3f4a923f9e14faef57b2d694bfc253fd10749414
Chih-Hung Hsieh [Fri, 27 May 2016 18:28:25 +0000 (18:28 +0000)]
Fix misc-macro-parentheses warnings am:
63b0519c3f
am:
8638a130fb
* commit '
8638a130fb5f9ceb91dff8847f636f8e03c7f377':
Fix misc-macro-parentheses warnings
Change-Id: I84e020ae253c783fa2c9006042e486f2ad805b50
Chih-Hung Hsieh [Fri, 20 May 2016 17:22:12 +0000 (10:22 -0700)]
Fix misc-macro-parentheses warnings in embdrv/sbc.
When compiled with WITH_TIDY=1, clang-tidy warns about
missing parameters around macro parameters.
Bug:
28705665
Change-Id: I79d234b88e090137412936b80303d21f0c59b0ae
Chih-Hung Hsieh [Fri, 27 May 2016 18:23:45 +0000 (18:23 +0000)]
Fix misc-macro-parentheses warnings
am:
63b0519c3f
* commit '
63b0519c3f0d1c0cc523e0e9553c60fc68651acc':
Fix misc-macro-parentheses warnings
Change-Id: If0986131e3e16f67f2de535db7825b12101c05a1
Chih-Hung Hsieh [Fri, 20 May 2016 17:29:31 +0000 (10:29 -0700)]
Fix misc-macro-parentheses warnings
When compiled with WITH_TIDY=1, clang-tidy warns about
missing parameters around macro parameters.
Bug:
28705665
Change-Id: I89c23cfe6eaefae5ef3c648a7c123c0501662c13
Marie Janssen [Fri, 27 May 2016 03:31:14 +0000 (03:31 +0000)]
DO NOT MERGE Randomize allocation canary am:
3387396e16 -s ours
am:
6a1637e129 -s ours
* commit '
6a1637e129456565d58056122428f619796c3eb9':
DO NOT MERGE Randomize allocation canary
Change-Id: I35e0817f13c2fb47de6f1819d518197384c0fa88
Marie Janssen [Fri, 27 May 2016 03:27:38 +0000 (03:27 +0000)]
DO NOT MERGE Randomize allocation canary
am:
3387396e16 -s ours
* commit '
3387396e167819510c499b5a5486b499b3f4868f':
DO NOT MERGE Randomize allocation canary
Change-Id: I87d650f2da46121e7b436a92f21d302f9870e5ee
Jakub Pawlowski [Fri, 27 May 2016 03:16:38 +0000 (03:16 +0000)]
Add minimum LE connection timeout that can be used for HID devices
am:
bfc90ee868
* commit '
bfc90ee868b042aa245eed8305047b35bddfdc5c':
Add minimum LE connection timeout that can be used for HID devices
Change-Id: I25aba0c882f7fe420e90f8ebd7f860410606d9d0
Marie Janssen [Fri, 4 Mar 2016 01:50:26 +0000 (17:50 -0800)]
DO NOT MERGE Randomize allocation canary
A static allocation canary can be susceptible to buffer overflow
exploit code bypassing, so this randomizes it on every run.
Bug:
27411268
Change-Id: I81b06f89951a012c08d846042653ec957f3e9127
(cherry picked from commit
7c054350fb7da9da1fdb86e7f7b9a801cf1c39e4)
Andre Eisenbach [Fri, 27 May 2016 00:35:02 +0000 (00:35 +0000)]
Fix GATT attribute value allocation am:
e509caac6c
am:
8688ff0e56
* commit '
8688ff0e564cf7a58617a3c5b17dceebed80f1a7':
Fix GATT attribute value allocation
Change-Id: If2554c781d2273b7282f5874610f749ffa114c3d
Andre Eisenbach [Fri, 27 May 2016 00:32:12 +0000 (00:32 +0000)]
Fix GATT attribute value allocation
am:
e509caac6c
* commit '
e509caac6cc2bcecccac4e9d75f9df31ccd51a84':
Fix GATT attribute value allocation
Change-Id: I4829af8c54e925fa21f6fb150237d4c92fc2711e
Andre Eisenbach [Fri, 27 May 2016 00:13:42 +0000 (17:13 -0700)]
Fix GATT attribute value allocation
new type(arg) != new type[arg].... :'(
Bug:
28888632
Change-Id: I5adb2d21b8c77f9edf6ff22f56341358bfec817e
Myles Watson [Thu, 26 May 2016 23:30:07 +0000 (23:30 +0000)]
Merge "test_vendor_lib: Add initial support for BLE" am:
89467754b2
am:
eac8dc3869
* commit '
eac8dc38690c31717981a29b911c958c1733ebf5':
test_vendor_lib: Add initial support for BLE
Change-Id: I5cc3d8a782abd0890ba56a036181c6dd3159f7b6
Myles Watson [Thu, 26 May 2016 23:27:40 +0000 (23:27 +0000)]
Merge "test_vendor_lib: Add initial support for BLE"
am:
89467754b2
* commit '
89467754b296a0907c4fd481e2a2a8d90fd874da':
test_vendor_lib: Add initial support for BLE
Change-Id: I38ff03ba36f67f7b76f2fa2b5378022d1e8b3321
Treehugger Robot [Thu, 26 May 2016 23:10:11 +0000 (23:10 +0000)]
Merge "test_vendor_lib: Add initial support for BLE"
Jakub Pawlowski [Thu, 26 May 2016 22:43:45 +0000 (22:43 +0000)]
Do not allow LE connection timeout smaller than 1s for HID devices am:
cbeed50f71
am:
8c18e84d7a
* commit '
8c18e84d7a92ce76ab8dad754c5bbeb5d2e4e31a':
Do not allow LE connection timeout smaller than 1s for HID devices
Change-Id: Ie6c06764b3e0340afd408ac50174944a5db4c963
Jakub Pawlowski [Thu, 26 May 2016 22:41:07 +0000 (22:41 +0000)]
Do not allow LE connection timeout smaller than 1s for HID devices
am:
cbeed50f71
* commit '
cbeed50f714a3b15a7be86ba484a3c89a4b6e9d7':
Do not allow LE connection timeout smaller than 1s for HID devices
Change-Id: I6174d66fef858f74daa609ab1d54ef5867083f5f
Jakub Pawlowski [Thu, 26 May 2016 22:13:04 +0000 (15:13 -0700)]
Add minimum LE connection timeout that can be used for HID devices
Fixes:
28979841
Change-Id: I520608a13224601fb9101d00c08b34cdb0f8d374
Jakub Pawlowski [Thu, 26 May 2016 22:13:04 +0000 (15:13 -0700)]
Do not allow LE connection timeout smaller than 1s for HID devices
Bug:
28979841
Change-Id: I520608a13224601fb9101d00c08b34cdb0f8d374
Jakub Pawlowski [Thu, 26 May 2016 22:12:49 +0000 (22:12 +0000)]
Linux build fix am:
0a0a7e96e7
am:
c6cf66126f
* commit '
c6cf66126fca4cdf74991599f40030959291074b':
Linux build fix
Change-Id: I35bd8d003615c51619a3969d39bbe61bc0ea6344
Jakub Pawlowski [Thu, 26 May 2016 22:06:33 +0000 (22:06 +0000)]
Linux build fix
am:
0a0a7e96e7
* commit '
0a0a7e96e7092f03a6dc568eb6358c6f4499e56a':
Linux build fix
Change-Id: I5b3ce85c972beb144238e26912fa20c733df433d
Jakub Pawlowski [Thu, 26 May 2016 22:04:47 +0000 (22:04 +0000)]
Convert GATT related BTA code to C++ am:
1911770165
am:
848edab3cc
* commit '
848edab3cc253e77ca9d346c336d09acea759015':
Convert GATT related BTA code to C++
Change-Id: I7189e11102b8a903591023313944ec27aabb4750
Jakub Pawlowski [Thu, 26 May 2016 22:04:47 +0000 (22:04 +0000)]
Remove all mentions of hashmap am:
01a3a24f1e
am:
19f84c2258
* commit '
19f84c225865b8be9918025f6ee77ba292faa24d':
Remove all mentions of hashmap
Change-Id: I89f1ef15a8eee00c02e67e935870da8513e2be82
Jakub Pawlowski [Thu, 26 May 2016 22:04:46 +0000 (22:04 +0000)]
Replace hash_map in data_dispatcher with C++ unordered_map am:
2b56e01a2d
am:
1a7aba1f8b
* commit '
1a7aba1f8bf9c5cd3a7b14ca307e686e06caf6a6':
Replace hash_map in data_dispatcher with C++ unordered_map
Change-Id: I9ad44acba2487093e2257bb72eac8ef978699bfe
Jakub Pawlowski [Thu, 26 May 2016 22:04:46 +0000 (22:04 +0000)]
Replace hash_map in audio_a2dp_hw with C++ unordered_map am:
6a059517c7
am:
a1908496cd
* commit '
a1908496cdb95aa82c5ebd9e33abab8673515cbe':
Replace hash_map in audio_a2dp_hw with C++ unordered_map
Change-Id: Id5cb4315b01c38750d0a90c24a5254d0770e9b27
Jakub Pawlowski [Thu, 26 May 2016 22:04:45 +0000 (22:04 +0000)]
Replace hash_map in btm_ble_bgconn with C++ unordered_map am:
488005b16b
am:
d0b8153e52
* commit '
d0b8153e52a0d60c379b3c6e877b52dcff9b6e94':
Replace hash_map in btm_ble_bgconn with C++ unordered_map
Change-Id: I64414d016242998985159379b2ef4a17e76cc2fc
Jakub Pawlowski [Thu, 26 May 2016 22:04:12 +0000 (22:04 +0000)]
Replace hash_map in peer with C++ unordered_map am:
0cafedaffc
am:
bdafde7d57
* commit '
bdafde7d57824b1918c8d5f1f482bbdd41d7aa2a':
Replace hash_map in peer with C++ unordered_map
Change-Id: Iaa39ba205f28c1058a801ad918ef7ef4fc2938f9
Jakub Pawlowski [Thu, 26 May 2016 22:04:11 +0000 (22:04 +0000)]
Replace hash_map in module_manager with C++ unordered_map am:
5c2c303953
am:
c4ddede45f
* commit '
c4ddede45ff4411ff5dc95bfc0e9c3c191d8b511':
Replace hash_map in module_manager with C++ unordered_map
Change-Id: I376ba5b659385caf4d2f7ed3b8cea207e5f41002
Jakub Pawlowski [Thu, 26 May 2016 22:04:10 +0000 (22:04 +0000)]
Replace hash_map in packet_fragmenter with C++ unordered_map am:
dd5e3e9e3f
am:
97899dbe86
* commit '
97899dbe863621ffd4492dbb67cab401e9ec5f82':
Replace hash_map in packet_fragmenter with C++ unordered_map
Change-Id: I3fbf72fc883bf65d4d7cfabe589d48d7edc5ed98
Jakub Pawlowski [Thu, 26 May 2016 22:04:09 +0000 (22:04 +0000)]
Remove unnecesarry hash_map includes am:
9b99e998a1
am:
080b0ace98
* commit '
080b0ace986966ced9dc7a96b8cd066b10ea5d90':
Remove unnecesarry hash_map includes
Change-Id: I783dd9d036bafe2433f6e8ada3f5d98ed2e7929b
Jakub Pawlowski [Thu, 26 May 2016 22:04:08 +0000 (22:04 +0000)]
Fix allocation_tracker crashes am:
0d55d66da2
am:
18970ae4b4
* commit '
18970ae4b4f773d5955e34a88011e57f5766c1da':
Fix allocation_tracker crashes
Change-Id: Ic16da3157e9d2a9467125edd6b7e593c22c13570
Jakub Pawlowski [Thu, 26 May 2016 22:03:57 +0000 (15:03 -0700)]
Linux build fix
Change-Id: Iae3d7d77dda70a288022d81a5f3c8f156b95adc9
Jakub Pawlowski [Thu, 26 May 2016 22:01:46 +0000 (22:01 +0000)]
Convert GATT related BTA code to C++
am:
1911770165
* commit '
19117701657073f3b8ba03620c081a8976b318a6':
Convert GATT related BTA code to C++
Change-Id: Icafa738fd8aaf822b9fb4de9b7a922c7e11e59cc
Jakub Pawlowski [Thu, 26 May 2016 22:01:45 +0000 (22:01 +0000)]
Remove all mentions of hashmap
am:
01a3a24f1e
* commit '
01a3a24f1e166e4b7328c7bfee3360601d1e1c26':
Remove all mentions of hashmap
Change-Id: I3245496328ced23907bdda7b76917fb77768efef
Jakub Pawlowski [Thu, 26 May 2016 22:01:44 +0000 (22:01 +0000)]
Replace hash_map in data_dispatcher with C++ unordered_map
am:
2b56e01a2d
* commit '
2b56e01a2d0ccf9eff58b24fb66c18280f95a680':
Replace hash_map in data_dispatcher with C++ unordered_map
Change-Id: Ifb681cc337b80b805d3c73878184e4eb5b0224f1
Jakub Pawlowski [Thu, 26 May 2016 22:01:42 +0000 (22:01 +0000)]
Replace hash_map in audio_a2dp_hw with C++ unordered_map
am:
6a059517c7
* commit '
6a059517c75400615dd26268d9bf81024091a85d':
Replace hash_map in audio_a2dp_hw with C++ unordered_map
Change-Id: I40b3928ad16f4107c05ada971561dfcc594afaf4
Jakub Pawlowski [Thu, 26 May 2016 22:01:41 +0000 (22:01 +0000)]
Replace hash_map in btm_ble_bgconn with C++ unordered_map
am:
488005b16b
* commit '
488005b16bd2552ce7e5f9c1e1b3d4072397fc26':
Replace hash_map in btm_ble_bgconn with C++ unordered_map
Change-Id: I1fc198dc6bcfe238d61b0eb30376459110b74b79
Jakub Pawlowski [Thu, 26 May 2016 22:01:12 +0000 (22:01 +0000)]
Replace hash_map in peer with C++ unordered_map
am:
0cafedaffc
* commit '
0cafedaffc0a189877b64d065571bec4ac6d804a':
Replace hash_map in peer with C++ unordered_map
Change-Id: Id2145094e305843420775202e3d9bb6ecf448dd1
Jakub Pawlowski [Thu, 26 May 2016 22:01:10 +0000 (22:01 +0000)]
Replace hash_map in module_manager with C++ unordered_map
am:
5c2c303953
* commit '
5c2c3039539023d7946021d49a985f6655a1aeda':
Replace hash_map in module_manager with C++ unordered_map
Change-Id: I9d2b7503af5991daaa0af2bbc362cc2f82bb088b
Jakub Pawlowski [Thu, 26 May 2016 22:01:09 +0000 (22:01 +0000)]
Replace hash_map in packet_fragmenter with C++ unordered_map
am:
dd5e3e9e3f
* commit '
dd5e3e9e3ffd2fe2b7d520c09acd98f79c3d9a38':
Replace hash_map in packet_fragmenter with C++ unordered_map
Change-Id: I7173996eb57753ceed8b0f334d2a1c8c9620f41c
Jakub Pawlowski [Thu, 26 May 2016 22:01:07 +0000 (22:01 +0000)]
Remove unnecesarry hash_map includes
am:
9b99e998a1
* commit '
9b99e998a112a447144fec13387003598220602b':
Remove unnecesarry hash_map includes
Change-Id: I561827d7942e0b7848edf60a1add0cc45e7a2b1c
Jakub Pawlowski [Thu, 26 May 2016 22:01:06 +0000 (22:01 +0000)]
Fix allocation_tracker crashes
am:
0d55d66da2
* commit '
0d55d66da26c079669975becfc29675f6492a155':
Fix allocation_tracker crashes
Change-Id: Ia6e0256f83f82ed49620030ef8955ccb3fd3bde8
Jakub Pawlowski [Thu, 26 May 2016 18:08:21 +0000 (11:08 -0700)]
Convert GATT related BTA code to C++
Change-Id: I9c36d0ebeb1143395b3b38b3d179d12a9503d28a
Jakub Pawlowski [Thu, 26 May 2016 17:20:59 +0000 (10:20 -0700)]
Remove all mentions of hashmap
Change-Id: I4594c401d91c6d5e2626ca92593f0f29833844ab
Jakub Pawlowski [Thu, 26 May 2016 17:13:40 +0000 (10:13 -0700)]
Replace hash_map in data_dispatcher with C++ unordered_map
Change-Id: Ic8d99108fd557a1d994dcea5a2bf92aef98a0cac
Jakub Pawlowski [Thu, 26 May 2016 00:49:32 +0000 (17:49 -0700)]
Replace hash_map in audio_a2dp_hw with C++ unordered_map
Change-Id: I64c7f72c91558bbbd2e31967d10733e0b98faa7e
Jakub Pawlowski [Thu, 26 May 2016 00:10:56 +0000 (17:10 -0700)]
Replace hash_map in btm_ble_bgconn with C++ unordered_map
Change-Id: I19b99b88d6dbcf6d6425d102bf908038c09325cb
Jakub Pawlowski [Wed, 25 May 2016 23:15:22 +0000 (16:15 -0700)]
Replace hash_map in peer with C++ unordered_map
Change-Id: Iae48d18cc370221c425b337fefb3a8255cda759a
Jakub Pawlowski [Wed, 25 May 2016 22:53:45 +0000 (15:53 -0700)]
Replace hash_map in module_manager with C++ unordered_map
Change-Id: I9ee3c9349a5ea80f17f65a137d7fe7be5dc63e70
Jakub Pawlowski [Wed, 25 May 2016 22:33:41 +0000 (15:33 -0700)]
Replace hash_map in packet_fragmenter with C++ unordered_map
Change-Id: I7707d21c44a5b8a18c925892d950155e3be72c30
Jakub Pawlowski [Wed, 25 May 2016 21:46:19 +0000 (14:46 -0700)]
Remove unnecesarry hash_map includes
Change-Id: I929b2ec88e33643f128a3a72130bdb091e0b2143
Jakub Pawlowski [Wed, 25 May 2016 17:37:17 +0000 (10:37 -0700)]
Fix allocation_tracker crashes
Use C++ unordered_map in allocation_tracker.
Bug:
28888632
Change-Id: I15204b0bede5686af25fc6cdd05ce3097b436dd6
Myles Watson [Tue, 24 May 2016 16:52:51 +0000 (09:52 -0700)]
test_vendor_lib: Add initial support for BLE
Change-Id: If0d8e07ee0c76ed5f22c5f111b7e7be7f28c7bc3
Pavlin Radoslavov [Thu, 26 May 2016 03:20:42 +0000 (03:20 +0000)]
Remove the RFComm MCB from the ports when releasing it
am:
77c3905fe7
* commit '
77c3905fe7907bd10b0d24dbe469ba74f546e00e':
Remove the RFComm MCB from the ports when releasing it
Change-Id: I1ebc0f1865be84fc800042a12a43253d13146757
Pavlin Radoslavov [Thu, 26 May 2016 02:42:57 +0000 (02:42 +0000)]
Remove the RFComm MCB from the ports when releasing it am:
1f9eb3d62c
am:
d03733b5eb
* commit '
d03733b5eb0c441170981861fe6de122d58c6736':
Remove the RFComm MCB from the ports when releasing it
Change-Id: I2f99d8206101542bdc4754ac16d77161c90c20b3
Pavlin Radoslavov [Thu, 26 May 2016 02:30:32 +0000 (02:30 +0000)]
Remove the RFComm MCB from the ports when releasing it
am:
1f9eb3d62c
* commit '
1f9eb3d62c78bae8b429a48f71629d6e53f9fc87':
Remove the RFComm MCB from the ports when releasing it
Change-Id: Ibffff4e80a8eb190e43426273927f1391f5a2c9a
Pavlin Radoslavov [Thu, 26 May 2016 01:08:29 +0000 (18:08 -0700)]
Remove the RFComm MCB from the ports when releasing it
Bug:
28849621
Change-Id: I3ce1c857d0d0a2c00c59d8f71b40685ae602dc29
(cherry picked from commit
1f9eb3d62c78bae8b429a48f71629d6e53f9fc87)
Pavlin Radoslavov [Thu, 26 May 2016 01:08:29 +0000 (18:08 -0700)]
Remove the RFComm MCB from the ports when releasing it
Bug:
28849621
Change-Id: I3ce1c857d0d0a2c00c59d8f71b40685ae602dc29
Jakub Pawlowski [Thu, 26 May 2016 01:25:34 +0000 (01:25 +0000)]
Merge "Remove unused profile manager" am:
48f8113216
am:
933c55539f
* commit '
933c55539fa08ffbdd523ba7cc332889a3040119':
Remove unused profile manager
Change-Id: Icc33fc6d75be4e3d697003ba640adbb6d0dffb94
Jakub Pawlowski [Thu, 26 May 2016 01:14:26 +0000 (01:14 +0000)]
Merge "Remove unused profile manager"
am:
48f8113216
* commit '
48f8113216935eed9374d50ab3ccc6704065e409':
Remove unused profile manager
Change-Id: I1a7ac124f5204aa78d4e885707d4bbe62ad8d0cd
Jakub Pawlowski [Thu, 26 May 2016 01:03:33 +0000 (01:03 +0000)]
Merge "Remove unused profile manager"
Jakub Pawlowski [Wed, 25 May 2016 23:30:29 +0000 (16:30 -0700)]
Remove unused profile manager
Change-Id: Ib718117b523030a4cf5a33672d5523c19fe79431
Myles Watson [Thu, 26 May 2016 00:12:03 +0000 (00:12 +0000)]
test_vendor_lib: run clang-format with brillo opts am:
e49120d722
am:
e398349913
* commit '
e3983499135327b083a67d3d3437158c1970ab42':
test_vendor_lib: run clang-format with brillo opts
Change-Id: Ib42c33c42c9c8722938e0b62250ab1002ec8ffd6
Myles Watson [Thu, 26 May 2016 00:04:09 +0000 (00:04 +0000)]
test_vendor_lib: run clang-format with brillo opts
am:
e49120d722
* commit '
e49120d722142f593687856a71cbffadc3caa530':
test_vendor_lib: run clang-format with brillo opts
Change-Id: I01dc545ca725404b5660ddf74b22d42ee9f7f87d
Jacky Cheung [Wed, 25 May 2016 23:05:57 +0000 (23:05 +0000)]
Improve config file sync during configuration save.
am:
3114ad623c
* commit '
3114ad623ca39bf6cbcee7f4841c00077faafcba':
Improve config file sync during configuration save.
Change-Id: If282bf987e823fe4a6548ea9addcad295751ac00
Myles Watson [Wed, 25 May 2016 21:44:57 +0000 (14:44 -0700)]
test_vendor_lib: run clang-format with brillo opts
Change-Id: Ie2ead0a020e2358696a2f0e26f3c76a9dd29e266
Signed-off-by: Myles Watson <mylesgw@google.com>
Jacky Cheung [Wed, 18 May 2016 22:41:09 +0000 (15:41 -0700)]
Improve config file sync during configuration save.
Add fsync() calls to force sync to disk while saving configuration
file. It is necessary to do a sync on the temp file before rename,
and to sync again on its parent directory to ensure both the
file content and the directory are up-to-date.
Bug:
27354612
Change-Id: I3a862ad59c8ae5beb8ea2c727eb5f275a2d5823e
(cherry picked from commit
95dbe03a693f4a920204b8c6acbba5269915a59f)
Pavlin Radoslavov [Wed, 25 May 2016 20:38:18 +0000 (13:38 -0700)]
resolve merge conflicts of
8bbbee1 to nyc-dev-plus-aosp
Change-Id: Iab6c8263aed7379ed81872a9299aff7e3fcaedbd
Ayan Ghosh [Mon, 11 Nov 2013 13:55:16 +0000 (19:25 +0530)]
Limit number of SBC frames to fit into single MTU
- Calculate number of SBC frames to fit into single MTU for EDR capable
remote devices. This makes sure the maximum utilization of the
available bandwidth, keeping the bitrate at high quality.
- This change helps to address the discrepancy seen with a few available
2 Mbps headsets which set the AVDTP media MTU size greater than the
2DH5 packet payload size which eventually forces AVDTP packets to get
fragmented in the controller. This change ensures packing of the SBC
frames in a way that AVDTP packet size fits within the 2DH5 payload
size.
- As packet size is restricted to meet the required bit rate more than
one AVDTP packet can be sent to the controller in a given iteration
based on the bit rate requirement.
Bug:
24875861
Change-Id: Icae7656ad563bbbdef65ecbfa15a89b26cf9edb2
Jakub Pawlowski [Tue, 24 May 2016 22:56:06 +0000 (22:56 +0000)]
Merge "Fix crashes in btif_sendmsg when worqueue not initialized" into nyc-dev
am:
d30b50a79b -s ours
* commit '
d30b50a79b0e9c2893da56a305f1c2e7803ff370':
Fix crashes in btif_sendmsg when worqueue not initialized
Change-Id: Icbc9002e51b4b02cd2d361d45df04566e542780e
Ajay Panicker [Tue, 24 May 2016 22:18:27 +0000 (22:18 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours am:
34619f8e30 am:
84970d1300
am:
9a26927387
* commit '
9a26927387eb13c2310e6a2e462f567f9c24d4b7':
Add guest mode functionality (2/3)
Change-Id: I990682f99d647f1db63e99584627632a5b7a4b81
Jakub Pawlowski [Tue, 24 May 2016 22:16:05 +0000 (22:16 +0000)]
Merge "Fix crashes in btif_sendmsg when worqueue not initialized" into nyc-dev
Ajay Panicker [Tue, 24 May 2016 22:15:52 +0000 (22:15 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours am:
34619f8e30
am:
84970d1300
* commit '
84970d13000623b266a72433474c4c2ae6abd3c6':
Add guest mode functionality (2/3)
Change-Id: I8e26f8bb0fa6898427507dfc888dfb6fd743fcac
Ajay Panicker [Tue, 24 May 2016 22:13:00 +0000 (22:13 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours
am:
34619f8e30
* commit '
34619f8e30adb98a2a605665b02df16a9fda6032':
Add guest mode functionality (2/3)
Change-Id: I00a7ad9675ba8e3f68e2066aca2fd1a5baaf06db
Ajay Panicker [Tue, 24 May 2016 22:10:22 +0000 (22:10 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5
am:
99bbe2fffe -s ours
* commit '
99bbe2fffe98c57295a26d35b30e15c432d6a1e3':
Add guest mode functionality (2/3)
Change-Id: Ie493166a8d452f2892bb96323b23527efe053dd7
Ajay Panicker [Tue, 24 May 2016 22:02:04 +0000 (22:02 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev
am:
4439d380e5
* commit '
4439d380e5e2ec3c24b04f7eba1bcbceae78191a':
Add guest mode functionality (2/3)
Change-Id: Ia13560babbc18e2ee290e16f9b03fb5202894c23
Ajay Panicker [Tue, 24 May 2016 21:53:32 +0000 (21:53 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev
Jacky Cheung [Tue, 24 May 2016 20:17:38 +0000 (20:17 +0000)]
Improve config file sync during configuration save. am:
95dbe03a69
am:
912d2c4bfc
* commit '
912d2c4bfcedc7c3e46aa2eea3b6c01c35d533d9':
Improve config file sync during configuration save.
Change-Id: I4b61d30a175ac4da6796b7034f5b299d51738062
Jacky Cheung [Tue, 24 May 2016 19:51:50 +0000 (19:51 +0000)]
Improve config file sync during configuration save.
am:
95dbe03a69
* commit '
95dbe03a693f4a920204b8c6acbba5269915a59f':
Improve config file sync during configuration save.
Change-Id: Ib337392e2bb6d0ee28c2400c92d62590faebeceb
Jakub Pawlowski [Tue, 24 May 2016 16:15:50 +0000 (09:15 -0700)]
Fix crashes in btif_sendmsg when worqueue not initialized
Instead of crashing whole stack when trying to post task to
uninitialized queue, log error message. This can happen in two cases:
stack is not initialized yet, or we're shutting down and already cleaned
up the workqueue thread.
Bug:
28889608
Change-Id: I9b8652d27abc2489b2489997c928634b68433a3e
Jacky Cheung [Wed, 18 May 2016 22:41:09 +0000 (15:41 -0700)]
Improve config file sync during configuration save.
Add fsync() calls to force sync to disk while saving configuration
file. It is necessary to do a sync on the temp file before rename,
and to sync again on its parent directory to ensure both the
file content and the directory are up-to-date.
Change-Id: I3a862ad59c8ae5beb8ea2c727eb5f275a2d5823e
Jakub Pawlowski [Tue, 24 May 2016 16:22:43 +0000 (16:22 +0000)]
Don\'t disconnect on failure to register for service changed notification am:
634c2e6f23
am:
927491ca41
* commit '
927491ca41147e37b8ceff8ea91aff89865788d7':
Don't disconnect on failure to register for service changed notification
Change-Id: I21f689f74a1178c5dfeacc79d57cf11dbfbc50df
Jakub Pawlowski [Tue, 24 May 2016 16:11:35 +0000 (16:11 +0000)]
Don\'t disconnect on failure to register for service changed notification
am:
268d8ca547
* commit '
268d8ca5475b97de2b950bd29c7ac7b0e4427511':
Don't disconnect on failure to register for service changed notification
Change-Id: I472ebd31177615ef19f0f9dc61058915487347d1
Jakub Pawlowski [Tue, 24 May 2016 16:11:34 +0000 (16:11 +0000)]
Don\'t disconnect on failure to register for service changed notification
am:
634c2e6f23
* commit '
634c2e6f23ccb25696d814161e8a2db686b16728':
Don't disconnect on failure to register for service changed notification
Change-Id: Iff7c70233be57c67565b2c6d5ef16b238c6b3ac0
Jakub Pawlowski [Mon, 23 May 2016 21:47:48 +0000 (14:47 -0700)]
Don't disconnect on failure to register for service changed notification
Bug:
28721625
Change-Id: I2214fb2576f0f0794922ed9b47d8805839d69bfd
Ben YoungTae Kim [Tue, 24 May 2016 02:57:33 +0000 (02:57 +0000)]
Fix the timestamp in btsnoop format am:
7dc4051b58
am:
36ccfcdfe6
* commit '
36ccfcdfe6e2ce7986d39cadd2c6a59e7c3ec982':
Fix the timestamp in btsnoop format
Change-Id: I0df61fc8dbba29643593c61d37e90e51fe5ff00b
Ben YoungTae Kim [Tue, 24 May 2016 02:55:09 +0000 (02:55 +0000)]
Fix the timestamp in btsnoop format
am:
7dc4051b58
* commit '
7dc4051b584bb056940afebda9d8ad3a48c046c3':
Fix the timestamp in btsnoop format
Change-Id: I138f704e1e6bc0df3eeb89a22f21d4623c848b4a
Jakub Pawlowski [Mon, 23 May 2016 21:47:48 +0000 (14:47 -0700)]
Don't disconnect on failure to register for service changed notification
Bug:
28721625
Change-Id: I2214fb2576f0f0794922ed9b47d8805839d69bfd
Ben YoungTae Kim [Mon, 23 May 2016 23:15:07 +0000 (16:15 -0700)]
Fix the timestamp in btsnoop format
Due to overflow, timestamp does not have correct value.
Make sure it should be saved in long long type as 64bit.
Change-Id: Iaf1b1dd746dd52ab7e50b870efacde2b8dd0bed6
Signed-off-by: Ben YoungTae Kim <ytkim@qca.qualcomm.com>
Andre Eisenbach [Mon, 23 May 2016 21:46:45 +0000 (21:46 +0000)]
Add L2CAP signaling headers and more ACL data to btsnooz am:
d4e1a93a6f
am:
fd68dc5e5e
* commit '
fd68dc5e5e77d39f22105e7701abbd643b4884bc':
Add L2CAP signaling headers and more ACL data to btsnooz
Change-Id: I58bf9acdaeda91162dc67994c0bb8c4c271271d2
OSDN Git Service
