OSDN Git Service
Pavlin Radoslavov [Thu, 13 Jul 2017 17:24:18 +0000 (17:24 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
8810ffba99
am:
0e590923e4 -s ours
Change-Id: I9b8d1a55ce8933d8e7d3c9e8f7aee595878f1f00
Pavlin Radoslavov [Thu, 13 Jul 2017 17:22:04 +0000 (17:22 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
8810ffba99
am:
c4d897fae0
Change-Id: I7d1d3df1901886b58fda82667ad9a34e86a12dee
Pavlin Radoslavov [Thu, 13 Jul 2017 17:19:10 +0000 (17:19 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
8810ffba99
Change-Id: I963e06b87ad133b661482df6e1b0fa8b8b15cbc4
Pavlin Radoslavov [Thu, 13 Jul 2017 17:19:07 +0000 (17:19 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
8810ffba99
Change-Id: Iba43743c47ce1e0dc0221177b0d168692fa44bdf
Ajay Panicker [Thu, 13 Jul 2017 00:21:43 +0000 (00:21 +0000)]
Allow collection of Bluetooth firmware dumps in bugreports (3/3)
am:
0580dd639c
Change-Id: I0ee8952683ef818d0b67d8fc5127f499bf9360fb
Timm Korte [Thu, 13 Jul 2017 00:19:33 +0000 (00:19 +0000)]
Merge "bt: fix sdp service name by removing NULL char" am:
2766da83df am:
8eff94efb9
am:
a54843d018
Change-Id: Ie541597466ef3e2e7b92c3dcd283bae5eea3649e
Timm Korte [Thu, 13 Jul 2017 00:17:34 +0000 (00:17 +0000)]
Merge "bt: fix sdp service name by removing NULL char" am:
2766da83df
am:
8eff94efb9
Change-Id: I13ea9e2e243efd14d6a3b43b9428996f24586e7e
Timm Korte [Thu, 13 Jul 2017 00:15:03 +0000 (00:15 +0000)]
Merge "bt: fix sdp service name by removing NULL char"
am:
2766da83df
Change-Id: I57de21a3a368cfc0312cce5498bb0beb70ae5cc2
Treehugger Robot [Thu, 13 Jul 2017 00:09:27 +0000 (00:09 +0000)]
Merge "bt: fix sdp service name by removing NULL char"
Jakub Pawlowski [Wed, 12 Jul 2017 22:59:27 +0000 (22:59 +0000)]
Make GATT server code more readable am:
b4e4799154 am:
dd80e5f674
am:
3688cf9d05
Change-Id: I443b22384d9ed6093c082ac199026233cb09bffa
Jakub Pawlowski [Wed, 12 Jul 2017 22:57:32 +0000 (22:57 +0000)]
Make GATT server code more readable am:
b4e4799154
am:
dd80e5f674
Change-Id: I61be21b37d2d0ea825412ad7cfecf3d7e74c905c
Jakub Pawlowski [Wed, 12 Jul 2017 22:55:28 +0000 (22:55 +0000)]
Make GATT server code more readable
am:
b4e4799154
Change-Id: I4ef576808d9f258a45f3158a94f285035944f1cc
Timm Korte [Mon, 15 May 2017 06:30:00 +0000 (08:30 +0200)]
bt: fix sdp service name by removing NULL char
The Bluedroid stack uses a C string with terminating NULL char as a
service name. Since in BT, strings are TLV encoded (type, length,
value), this doesn't make sense.
Simple fix is to copy the string without the trailing NULL by
removing the "+1" after the strlen call when passing the string as
uint8_t array to the lower level functions.
The current behaviour keeps some older devices from being able to
connect to an Android providing a Serial Port profile due to having
the wrong service name (that is, including a NULL at the end instead
of the correct string).
Test: Checked against Linux BlueZ, which does not include this extra
null character.
Change-Id: I6a43024ff89ac09e4b2d2e5cfb407b6e9323f0bd
Signed-off-by: Timm Korte <timm.korte@gmail.com>
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Ajay Panicker [Wed, 12 Jul 2017 18:45:08 +0000 (11:45 -0700)]
Allow collection of Bluetooth firmware dumps in bugreports (3/3)
This patch is temporary and should be removed once the bug is resolved
Bug:
63390057
Test: Force a hci timeout and collect a bugreport on walleye
Change-Id: Idab6d87c1b0540ea325fa1019ea2c9e97f3218f2
Jack He [Wed, 12 Jul 2017 02:53:44 +0000 (02:53 +0000)]
GATT: Expose opportunistic client API to Java
am:
e6f40cd3d9 -s ours
Change-Id: Ibc12e12a8f2824b4324dae332dbf69d3624893e4
Jakub Pawlowski [Tue, 11 Jul 2017 22:36:48 +0000 (15:36 -0700)]
Make GATT server code more readable
Test: compilation test
Change-Id: Ia176d7a89ccb9590c80e5b6b8af5a3495bf2ab16
Jack He [Thu, 29 Jun 2017 20:58:47 +0000 (13:58 -0700)]
GATT: Expose opportunistic client API to Java
* Opportunistic GATT connection allows system service to subscribe to
characteristic notifications without holding the BLE connection
* Exposing this flag to Java allows Android applications to use it
Bug:
63347806
Test: make, test on Android App
Change-Id: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
Merged-In: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
(cherry picked from commit
5120fedf20eb29fa65cef561c475d18d51197b25)
jruthe [Tue, 11 Jul 2017 21:29:43 +0000 (21:29 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs" am:
2dd6b59d57 am:
9d153dd187
am:
a6cb7ae553
Change-Id: Ic7c88720d7e137ddb7fb4626381b3099a7843593
jruthe [Tue, 11 Jul 2017 21:26:23 +0000 (21:26 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs" am:
2dd6b59d57
am:
9d153dd187
Change-Id: I3844e71bb8faa237e552b31e5f5369b0f9462c50
jruthe [Tue, 11 Jul 2017 21:22:51 +0000 (21:22 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs"
am:
2dd6b59d57
Change-Id: If0995021d9201b91acaf49a891e2682e5a4f855e
Treehugger Robot [Tue, 11 Jul 2017 21:16:16 +0000 (21:16 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs"
Jack He [Tue, 11 Jul 2017 20:46:28 +0000 (20:46 +0000)]
GATT: Expose opportunistic client API to Java am:
5120fedf20 am:
27a9e1249d
am:
ab98252aeb
Change-Id: If5d94a54390718d73f8d55aacbf1d7c78fc2db7b
Jack He [Tue, 11 Jul 2017 20:37:57 +0000 (20:37 +0000)]
GATT: Expose opportunistic client API to Java am:
5120fedf20
am:
27a9e1249d
Change-Id: I00f499f1851c2ab6459cbcca0c4d02380005a392
Jack He [Tue, 11 Jul 2017 20:24:11 +0000 (20:24 +0000)]
GATT: Expose opportunistic client API to Java
am:
5120fedf20
Change-Id: I96347363962687799e5ca56feefc40eef56ae7e2
Jakub Pawlowski [Tue, 11 Jul 2017 20:03:33 +0000 (20:03 +0000)]
Fix crashes on stack shutdown
am:
864cb9d2db -s ours
Change-Id: I5164357cda3907805cb48cf6fd3347c0ed1db41d
Jakub Pawlowski [Thu, 22 Jun 2017 19:45:30 +0000 (12:45 -0700)]
Fix crashes on stack shutdown
During stack shutdown, Unregister would sometimes get called after the
stack is already cleaned up, and the AdvertiseManager::Get would crash
on null check assertion. Ensure that stack is initialized before
Unregister call.
Bug:
37888261
Test: none
Change-Id: I7a4bbcd24ec7d24d21d04fe842985baaac899321
Merged-In: I7a4bbcd24ec7d24d21d04fe842985baaac899321
jruthe [Thu, 8 Jun 2017 22:33:32 +0000 (15:33 -0700)]
test_vendor: Implement packet assembly for SDUs
Created l2cap.* and l2cap_sdu.* for assembling an L2CAP packet from a
stream of SDU packets.
Test: Passed all tests in l2cap_test.cc and l2cap_sdu_test.cc
Change-Id: I64487ee67170b1dd4eda9555321b1ecf7ed57040
Jack He [Thu, 29 Jun 2017 20:58:47 +0000 (13:58 -0700)]
GATT: Expose opportunistic client API to Java
* Opportunistic GATT connection allows system service to subscribe to
characteristic notifications without holding the BLE connection
* Exposing this flag to Java allows Android applications to use it
Bug:
35874078
Test: make, test on Android App
Change-Id: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
Tom Turney [Fri, 7 Jul 2017 21:27:42 +0000 (21:27 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev
am:
7e30dce07c
Change-Id: Ic44edb9e7a70144572f1a8866f39bc41b34e56ba
TreeHugger Robot [Fri, 7 Jul 2017 21:22:41 +0000 (21:22 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev
Jinguang Dong [Fri, 7 Jul 2017 19:56:42 +0000 (19:56 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
8a836291dc
Change-Id: Ia26ee3594d1e608308b23e498caa5f47850de94c
Tom Turney [Fri, 7 Jul 2017 18:11:46 +0000 (18:11 +0000)]
Revert "Blacklist Kinivo BTC350 for Absolute Volume"
This reverts commit
84e8fa9b0873c31b6ee5dce53405db9e9ff77a31.
This is actually due to b/
63073544 not an issue with the device.
Change-Id: I8433adcfc7ff8f3bf8a16eccb72f0522fa896fef
Jinguang Dong [Wed, 28 Jun 2017 01:50:37 +0000 (09:50 +0800)]
Do not delete device record on HCI_ERR_KEY_MISSING
If an auth_complete event is received with HCI_ERR_KEY_MISSING, the
p_dev_rec->sm4 flag will be set to "BTM_SM4_UNKNOWN" in the
BTM_SecClearSecurityFlags() function. This will prevent the
BTM_SM4_RETRY procedure from being executed, which can cause
pairing failures.
To reproduce:
1. Two Phones, A: Android O, B: Android N.
2. Enable B in Bluetooth visable mode
3. A start discovery and create pairing with B successfully
4. B cancel pairing with A by remove A from pairing device
list of B.
5. A create paring with B again by touch paired device in A,
this first step will be failed.
Bug:
62615213
Test: manual
Change-Id: I514ba2f4d0fd2621c11bd83aeec24b8c6c6d2d5a
Signed-off-by: Yequan Song <songyequan@huawei.com>
(cherry picked from commit
549ec693c2a3a240a5b688a1311cc7c55daa59fc)
Android Build Merger (Role) [Fri, 7 Jul 2017 06:41:17 +0000 (06:41 +0000)]
Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69" into oc-dr1-dev-plus-aosp
Jiyong Park [Fri, 7 Jul 2017 06:41:08 +0000 (06:41 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
am:
5562865e69
Change-Id: I8248c9bdb3967f41927766cd658fa35eef8f4dbb
Jiyong Park [Fri, 7 Jul 2017 06:41:04 +0000 (06:41 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
am:
5562865e69
Change-Id: Ic65b0b4a8fe2e47cec599c24c1dfe3cb42814e3d
Jiyong Park [Fri, 7 Jul 2017 06:40:47 +0000 (06:40 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c
am:
a081b71033
Change-Id: Ib7882ffb5f0fd9e186a5127edfa3932a67450bfb
Android Build Merger (Role) [Fri, 7 Jul 2017 06:37:24 +0000 (06:37 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
Jiyong Park [Fri, 7 Jul 2017 06:37:15 +0000 (06:37 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a
am:
9ae297d02c
Change-Id: Id9d7b0469261cde673a9d3206eb789f089967fd3
Jiyong Park [Fri, 7 Jul 2017 06:37:05 +0000 (06:37 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a
am:
9ae297d02c
Change-Id: I9257d4773e2e5b69ae21370e3b5b362967b9f123
Jiyong Park [Fri, 7 Jul 2017 06:33:15 +0000 (06:33 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
am:
29f359181a
Change-Id: Ic63d5ccafceb91f2eddf3a41c8a3b8be6d200b0c
Treehugger Robot [Fri, 7 Jul 2017 06:27:41 +0000 (06:27 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
Jinguang Dong [Fri, 7 Jul 2017 06:10:44 +0000 (06:10 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2 am:
b415ac8648
am:
009ffa8c7e
Change-Id: I4e2e1e191c85f2bdb6ed559a6eec39ebed4be08f
Jinguang Dong [Fri, 7 Jul 2017 06:06:43 +0000 (06:06 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2
am:
b415ac8648
Change-Id: I571bc39274f4f99663948789b323eba6c598b5f6
Jinguang Dong [Fri, 7 Jul 2017 06:02:43 +0000 (06:02 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
549ec693c2
Change-Id: I8c9ea5fad01fbb68b9f7067f7682cc9cd870daa2
Jinguang Dong [Wed, 28 Jun 2017 01:50:37 +0000 (09:50 +0800)]
Do not delete device record on HCI_ERR_KEY_MISSING
If an auth_complete event is received with HCI_ERR_KEY_MISSING, the
p_dev_rec->sm4 flag will be set to "BTM_SM4_UNKNOWN" in the
BTM_SecClearSecurityFlags() function. This will prevent the
BTM_SM4_RETRY procedure from being executed, which can cause
pairing failures.
To reproduce:
1. Two Phones, A: Android O, B: Android N.
2. Enable B in Bluetooth visable mode
3. A start discovery and create pairing with B successfully
4. B cancel pairing with A by remove A from pairing device
list of B.
5. A create paring with B again by touch paired device in A,
this first step will be failed.
Bug:
62615213
Test: manual
Change-Id: I514ba2f4d0fd2621c11bd83aeec24b8c6c6d2d5a
Signed-off-by: Yequan Song <songyequan@huawei.com>
Jiyong Park [Fri, 7 Jul 2017 04:29:16 +0000 (13:29 +0900)]
Mark libbluetooth-types as vendor_available
libbluetooty-types is used by a vendor module
android.hardware.bluetooth@1.0-service.sim, thus marking it as
vendor_available so that the lib is allowed for the HAL service when
building with BOARD_VNDK_VERSION.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j
android.hardware.bluetooth@1.0-service.sim
Change-Id: I39d071fc249ce6842e7175751abd6249b9367231
Android Build Merger (Role) [Fri, 7 Jul 2017 01:45:55 +0000 (01:45 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 01:45:53 +0000 (01:45 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:46 +0000 (01:45 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
am:
e2dedfe267 -s ours
Change-Id: I57e407e09cf016d3e1c80b8ff23c906cd2f804d5
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:45 +0000 (01:45 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
am:
e2dedfe267 -s ours
Change-Id: Ifc43f0dd2d2be6fd811d2e07ed78c2543b454d3f
Android Build Merger (Role) [Fri, 7 Jul 2017 01:45:39 +0000 (01:45 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours" into oc-dr1-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours
am:
819ea67f58 -s ours
Change-Id: I105d3635878c632c6f74e856cdd8191676e148a5
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:30 +0000 (01:45 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours
am:
819ea67f58 -s ours
Change-Id: I0a474b7c088dd21e5d4d48cdca036350c0bde000
Android Build Merger (Role) [Fri, 7 Jul 2017 01:44:28 +0000 (01:44 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 01:43:38 +0000 (01:43 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:30 +0000 (01:43 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours
am:
8a5238a97a -s ours
Change-Id: I91ce9a209d77e13aef59d087a5e4910499f9e45a
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:27 +0000 (01:43 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
am:
4669be25d5 -s ours
Change-Id: Ida9eb27eab54f87d9791dcb7108cb7351aec4fa2
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
am:
4669be25d5 -s ours
Change-Id: Id8d611928dc23949ec94cf24ce5ec818e0df48b8
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours
am:
8a5238a97a -s ours
Change-Id: Ib448b233562470db184826e5136e4d9dfde367c3
Jakub Pawlowski [Fri, 7 Jul 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
6ad7d19e69
am:
96481ffe75
Change-Id: I2d8c1d2040f29c47e144a46d9f3ccc6ceb11edb0
Jakub Pawlowski [Fri, 7 Jul 2017 01:40:14 +0000 (01:40 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744
am:
56978c211d -s ours
Change-Id: Ib77fc61181d7e8ee035a706e149868699a9decc1
Jakub Pawlowski [Fri, 7 Jul 2017 01:38:05 +0000 (01:38 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744
am:
6ad7d19e69
Change-Id: I56c4b867de829c86dd4f742ac1fce01ce2951f4b
Android Build Merger (Role) [Fri, 7 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
Jakub Pawlowski [Fri, 7 Jul 2017 01:36:41 +0000 (01:36 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I61d249aa17044cd55b6834bc9563f648362621b6
Jakub Pawlowski [Fri, 7 Jul 2017 01:35:36 +0000 (01:35 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I05b23ab3aff4d61dd8b04a3f011e832305203ce5
Treehugger Robot [Fri, 7 Jul 2017 01:29:30 +0000 (01:29 +0000)]
Merge "Make RawAddress into a class (1/3)"
Myles Watson [Thu, 6 Jul 2017 23:33:35 +0000 (23:33 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master am:
1b8043bbe0
am:
b88afe75f1
Change-Id: I25f7a6e7f29e123cbceb386754c6a65e0b0d525e
Myles Watson [Thu, 6 Jul 2017 23:33:21 +0000 (23:33 +0000)]
Remove unused BDADDR definitions am:
525e743277 am:
799a72b7c2
am:
bc44e51f23
Change-Id: I5b1a055b24964f3da1efd816dbaae438b543b329
Philip Cuadra [Thu, 6 Jul 2017 23:30:45 +0000 (23:30 +0000)]
Bluetooth - Add tracing for TX queue and LDAC ABR
am:
08beff46bc
Change-Id: Icd60fb8123acb30279fc86df19c8dbb21ba7372b
Philip Cuadra [Fri, 9 Jun 2017 21:36:06 +0000 (14:36 -0700)]
Bluetooth - Add tracing for TX queue and LDAC ABR
For debugging, add tracing to show the length of the TX queue and the
LDAC ABR level.
Test: Ran bluetooth, took a systrace
Change-Id: Ia23764d68f27ae8209e37c4a0836852d73cf6cbc
Myles Watson [Thu, 6 Jul 2017 23:09:42 +0000 (23:09 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
am:
1b8043bbe0
Change-Id: I74ab0fb68ea45e31ab517a553d98e612c40b47ff
Myles Watson [Thu, 6 Jul 2017 23:09:26 +0000 (23:09 +0000)]
Remove unused BDADDR definitions am:
525e743277
am:
799a72b7c2
Change-Id: Id08c1c926e2ff224d44a5cdd72f75c1391347e89
Android Build Merger (Role) [Thu, 6 Jul 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
Myles Watson [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I211d82d42a53fe9bb2a6b930c7d99d5187b4f850
Myles Watson [Thu, 6 Jul 2017 22:56:14 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I13b1c9dd558bf8662f5f9af0008df0740ec333ae
Jakub Pawlowski [Mon, 3 Jul 2017 22:39:36 +0000 (15:39 -0700)]
Make RawAddress into a class (1/3)
* Add libbluetooth-types - library containing types implementation, that
is common between stystem/bt and packages/apps/Bluetooth. It must be
included in every project using btif interface.
* Put Raw Address implementation into libbluetooth-types
* Unify all "to/from string" helper methods into ToString and FromString
* bd_addr_empty -> RawAddress::kEmpty
* bd_addr_any -> RawAddress::kAny
Also fix leaks in jni str2addr by adding ReleaseStringUTFChars
Test: types_unittest
Change-Id: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Merged-In: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Srinu Jella [Thu, 6 Jul 2017 19:56:34 +0000 (19:56 +0000)]
Don't initiate role switch for blacklisted devices
am:
b47bf4e5ae -s ours
Change-Id: I4013c5ff70044c26f92582567e5c6ffe397c29fe
Myles Watson [Wed, 28 Jun 2017 17:28:47 +0000 (10:28 -0700)]
Remove unused BDADDR definitions
The code that used these moved to the HAL.
Test: build
Change-Id: I4a25b525ff60c060143ea913c800c4dea8f676e1
Srinu Jella [Wed, 7 Dec 2016 13:46:31 +0000 (19:16 +0530)]
Don't initiate role switch for blacklisted devices
Some devices always reject role switches and role switch
retries from the DUT may lead to A2DP glitches and LMP timeouts.
Test: manual
Bug:
33000157
Change-Id: I535a2c45ced0e14cf5530f78f3367569b306b1f4
Merged-In: I535a2c45ced0e14cf5530f78f3367569b306b1f4
(cherry picked from commit
811200c8d120d987695445c28fda378677ba21c1)
Ajay Panicker [Thu, 6 Jul 2017 17:44:24 +0000 (17:44 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop" am:
1c6f5e6a5c am:
5e8da48d76
am:
586600890b
Change-Id: I3894f546925d11168eb77c540085473788f93760
Ajay Panicker [Thu, 6 Jul 2017 17:43:14 +0000 (17:43 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop" am:
1c6f5e6a5c
am:
5e8da48d76
Change-Id: I4e88bb24985e18e5f29e60cde26c184d85b3fb79
Ajay Panicker [Thu, 6 Jul 2017 17:41:54 +0000 (17:41 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop"
am:
1c6f5e6a5c
Change-Id: I8a90de11fea85a01747d35e655e24d9c3f0ad41b
Treehugger Robot [Thu, 6 Jul 2017 17:39:05 +0000 (17:39 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop"
Pavlin Radoslavov [Thu, 6 Jul 2017 17:36:54 +0000 (17:36 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues" am:
ea5319f3e0 am:
75236c40f6
am:
3945c2b913
Change-Id: I5f13619a25d9d8c4e5c1acead64de00465d3a29f
Pavlin Radoslavov [Thu, 6 Jul 2017 17:34:24 +0000 (17:34 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues" am:
ea5319f3e0
am:
75236c40f6
Change-Id: I5fca11ed98a3f7b96228a8a207b989be956962ca
Pavlin Radoslavov [Thu, 6 Jul 2017 17:33:16 +0000 (17:33 +0000)]
Add missing lock protection when freeing RFCOMM port queues
am:
15badf7819
Change-Id: I12677b8a1969c44b70e84912b4a1d890480b9f55
koh.changseok [Thu, 6 Jul 2017 17:33:04 +0000 (17:33 +0000)]
Merge "A2DP: Add mandatory elements for SBC SRC capabilities" into oc-dr1-dev
am:
6487bb64f5
Change-Id: I6d3e9f75c51ff58d85bd5c1fa73e003afa96b327
Pavlin Radoslavov [Thu, 6 Jul 2017 17:32:43 +0000 (17:32 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues"
am:
ea5319f3e0
Change-Id: Idee0119a6aae76df40a65d91618fe42130768f65
Pavlin Radoslavov [Sat, 1 Jul 2017 04:25:15 +0000 (21:25 -0700)]
Add missing lock protection when freeing RFCOMM port queues
Bug:
63100223
Test: Code compilation
Change-Id: Ibbafb9586e9807688276c9eb2f6399cb3ee487c9
(cherry picked from commit
16f4cf0bb17cee817da11f2775f4a00d290eaba7)
Treehugger Robot [Thu, 6 Jul 2017 17:19:53 +0000 (17:19 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues"
TreeHugger Robot [Thu, 6 Jul 2017 17:19:45 +0000 (17:19 +0000)]
Merge "A2DP: Add mandatory elements for SBC SRC capabilities" into oc-dr1-dev
koh.changseok [Thu, 6 Jul 2017 02:32:42 +0000 (02:32 +0000)]
Merge "Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672" into stage-aosp-master am:
64305a2ac5
am:
410b2306a3
Change-Id: I9622dafd3023fc7317679bf06f7e53a4e1fc9541
koh.changseok [Thu, 6 Jul 2017 02:32:29 +0000 (02:32 +0000)]
Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672 am:
09a943f17f
am:
c661b860be
Change-Id: I52b019ef904c83c711b63ad61184292fb796dddb
koh.changseok [Thu, 6 Jul 2017 02:21:06 +0000 (02:21 +0000)]
Merge "Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672" into stage-aosp-master
am:
64305a2ac5
Change-Id: I0233ab022b485651821d16e1cf2f46d69b1d0a2c
koh.changseok [Thu, 6 Jul 2017 02:20:53 +0000 (02:20 +0000)]
Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672
am:
09a943f17f
Change-Id: I49aeef656e17909b133123f89efcc5fbcb1c4346
Srinu Jella [Thu, 6 Jul 2017 02:18:27 +0000 (02:18 +0000)]
Dynamic blacklist device for role switch
am:
ab404e6f4a -s ours
Change-Id: I350f57169424ef6efed16b38a79bae9dee2fb624
Android Build Merger (Role) [Thu, 6 Jul 2017 02:10:53 +0000 (02:10 +0000)]
Merge "Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672" into stage-aosp-master
koh.changseok [Thu, 6 Jul 2017 02:10:46 +0000 (02:10 +0000)]
Merge "A2DP: Add mandatory elements for SBC SRC capabilities"
am:
e0a0913672
Change-Id: I28432a70beeb57771174a32edeb0629d97200bfc
OSDN Git Service
