OSDN Git Service
Jack He [Wed, 4 Oct 2017 18:07:01 +0000 (18:07 +0000)]
A2DP: Advance btif profile queue on OPENING->other_state transition am:
a362647758
am:
9681130c74
Change-Id: Ic0f7e2a5f0a82fcdfbf3769c3bf6a718ef33847e
c_sdamga [Wed, 4 Oct 2017 18:06:32 +0000 (18:06 +0000)]
Handle Disconnect request in AV Opening State handler am:
ff1b9d26ca
am:
f1e77c091a
Change-Id: I22ef0ef08ec769928ffcdb0113455af765e53d4d
Jack He [Wed, 4 Oct 2017 17:37:39 +0000 (17:37 +0000)]
A2DP: Advance btif profile queue on OPENING->other_state transition
am:
a362647758
Change-Id: I322c3ef42b38106a7cb1206b7e1c02dac79c3aa5
c_sdamga [Wed, 4 Oct 2017 17:36:25 +0000 (17:36 +0000)]
Handle Disconnect request in AV Opening State handler
am:
ff1b9d26ca
Change-Id: I508456cc74a52b61ca0aadcde5d39588fcebb861
Jack He [Mon, 2 Oct 2017 21:07:33 +0000 (14:07 -0700)]
A2DP: Advance btif profile queue on OPENING->other_state transition
* Entering BTIF_AV_STATE_OPENING is only possible through
BTIF_AV_CONNECT_REQ_EVT (initiated by us) OR
BTA_AV_PENDING_EVT (initiated by remote)
from BTIF_AV_STATE_IDLE
* If we go from BTIF_AV_CONNECT_REQ_EVT, we must have a pending
connection request in btif_profile_queue that should be advanced when
we quit BTIF_AV_STATE_OPENING state
* This CL adds a flag to indicate whether an AV connection is initiated
by us and only advance queue when it is
* Also add queue advancement in BTA_AV_REJECT_EVT and BTA_AV_CLOSE_EVT
Bug:
67317954
Test: make
Change-Id: I16dc8ebf76c6edaacb1f7a4a44e604170ff9a8b0
c_sdamga [Mon, 20 Jul 2015 13:47:04 +0000 (19:17 +0530)]
Handle Disconnect request in AV Opening State handler
Usecase:
1. Uncheck media from settings UI
2. initiate A2dp connection from remote, send AVRCP play from remote
Failure:
A2dp connection stuck in opening state.
Rootcause:
When A2dp is unchecked from settings UI and remote initiated
a2dp connection and AVRCP play, music starts streaming on DUT
since A2dp connection disconnected. As A2dp connection was not
completed, btif state stuck in opening state.
Fix:
Handled the disconnection request in the opening state
so that AV state machine moves to proper state before
processing AVRCP Play.
Test: 1. Uncheck media from settings UI
2. initiate A2dp connection from remote, send AVRCP play
Bug:
35415160
Change-Id: If1cda5b78100419fdc60c97349efafdd4a18d40c
Subramanian Srinivasan [Tue, 3 Oct 2017 19:32:27 +0000 (19:32 +0000)]
Fix adv instance validity check during suspend and resume of resolving list am:
2e08795a89
am:
e94eed5c52
Change-Id: Ibd32a00a857295b2ec605a22156086ed74a69a07
Subramanian Srinivasan [Tue, 3 Oct 2017 19:31:12 +0000 (19:31 +0000)]
Fix adv instance validity check during suspend and resume of resolving list
am:
2e08795a89
Change-Id: I8a0b390c60ab2ef35407931e4e6baf56cddcfd69
Subramanian Srinivasan [Fri, 29 Sep 2017 01:41:03 +0000 (18:41 -0700)]
Fix adv instance validity check during suspend and resume of resolving list
When BT is shutdown, multi advertisement instance pointer is made
null by BleAdvertisingManager::CleanUp function.
Any subsequent BleAdvertisingManager::Get function call made at
this point(eg during suspension and resumption of resolving list
activity)leads to a crash as the instance pointer is null.
Hence, use BleAdvertisingManager::IsInitialized function instead
of BleAdvertisingManager::Get function to check the validity of
multi advertisement instance.
Bug:
67325491
Change-Id: Ibbae7fa546bb52494be78eaff6d4b7b15614ab15
Stanley Tng [Tue, 3 Oct 2017 16:56:48 +0000 (16:56 +0000)]
Add comments to function arrays to indicate usage am:
5af6abaf2e
am:
5fe2a86efe
Change-Id: I9c6358f5b1f7b48302b447432cf6418658112fc2
Stanley Tng [Tue, 3 Oct 2017 16:54:52 +0000 (16:54 +0000)]
Add comments to function arrays to indicate usage
am:
5af6abaf2e
Change-Id: Ic9672ec4fe12571004355735105a0a820f2159d4
Stanley Tng [Fri, 29 Sep 2017 16:01:25 +0000 (09:01 -0700)]
Add comments to function arrays to indicate usage
No logic change. More comments are added to function arrays to indicate
how each array entry are used.
Test: Manual
Change-Id: I59283cb9786da6f3a4b8a4b36e36e79a25ca6cb8
Pavlin Radoslavov [Tue, 3 Oct 2017 14:26:02 +0000 (14:26 +0000)]
Fixed the implementation of std::equal_to<bt_bdaddr_t> am:
181144a501
am:
eb9ba99523 -s ours
Change-Id: Icb88881bc68722c67ee63d70ff4cbe7b575090f6
Pavlin Radoslavov [Tue, 3 Oct 2017 05:15:41 +0000 (05:15 +0000)]
Fixed the implementation of std::equal_to<bt_bdaddr_t>
am:
181144a501
Change-Id: Ic8e35d75ebe14eccd7fd169572fe5bff39d150f6
Dan Willemsen [Tue, 3 Oct 2017 03:19:05 +0000 (03:19 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am:
092fdf13ec
am:
ae39e0abae
Change-Id: I1daee4dbd08bda84bd28d41e7cf13351223eedf2
Pavlin Radoslavov [Wed, 30 Aug 2017 00:03:21 +0000 (17:03 -0700)]
Fixed the implementation of std::equal_to<bt_bdaddr_t>
Now we correctly suppress the processing of repetitive
BLE scan results.
Test: Manual with extra log messages
Bug:
65174158
Bug:
64975965
Change-Id: Ic4386c5e2fbabdc218f6ec675c5b298a7af41e5a
Merged-In: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Dan Willemsen [Tue, 3 Oct 2017 02:54:53 +0000 (02:54 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am:
092fdf13ec
Change-Id: Ifbc8f21a19347ae08dfc4a04d3a7dcc9e890f3fc
Dan Willemsen [Tue, 3 Oct 2017 02:30:06 +0000 (02:30 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
Hemant Gupta [Mon, 2 Oct 2017 23:27:51 +0000 (23:27 +0000)]
Merge "HID: Free process_repage_timer to prevent leak" am:
4a8ff03328
am:
575b4f7fb6
Change-Id: I1a46c749f42c968a2438384144f94c4d6ca9b778
Hemant Gupta [Mon, 2 Oct 2017 23:24:37 +0000 (23:24 +0000)]
Merge "HID: Free process_repage_timer to prevent leak"
am:
4a8ff03328
Change-Id: Ib962c89810306be308f9b6fc48f0404e98b6965d
Treehugger Robot [Mon, 2 Oct 2017 23:02:56 +0000 (23:02 +0000)]
Merge "HID: Free process_repage_timer to prevent leak"
Stanley Tng [Mon, 2 Oct 2017 18:39:06 +0000 (18:39 +0000)]
Add more logs for Bluetooth connection errors am:
a712d14638
am:
8af08f42a0
Change-Id: I8d9b7009bd450dda09415ae82ae3ac888d18cf72
Stanley Tng [Mon, 2 Oct 2017 18:34:32 +0000 (18:34 +0000)]
Add more logs for Bluetooth connection errors
am:
a712d14638
Change-Id: I86ea947f8ced69263a08f4f9cdd55daf4f9fa8bf
Hemant Gupta [Wed, 13 Sep 2017 12:05:03 +0000 (17:35 +0530)]
HID: Free process_repage_timer to prevent leak
Usecase:
1) Perform BT on/off stress test
2) Check for memory leakage in code in subsequent BT on/off usecase
Expectation
No memory leak during BT on/off stress test
Observed result
Memory leakage in hid code where alarm process_repage_timer is not freed
and only cancelled
Fix:
Free alarm process_repage_timer during HID Host deregstration
Test: Checked with BT on/off usecase, and alarm process_repage_timer is now
freed in every BT on/off usecase.
Bug:
65657207
Change-Id: Iccecd126716a5660f4c37ddc917bacee84342297
Dan Willemsen [Mon, 2 Oct 2017 17:41:11 +0000 (10:41 -0700)]
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
In the future, target.linux will apply to all targets running a linux kernel
(android, linux_glibc, linux_bionic). So move all current users to the specific
linux_glibc.
There will be another cleanup pass later that will move some instances back to
target.linux if the properties should be shared with target.android and
target.linux_bionic, but target.linux needs to be removed first.
Test: out/soong/build.ninja identical before/after
Change-Id: Iadc1ba324e03fd2b1b52bf471ffa2a71e0ec3e61
Exempt-From-Owner-Approval: build system cleanup
Stanley Tng [Thu, 28 Sep 2017 19:55:41 +0000 (12:55 -0700)]
Add more logs for Bluetooth connection errors
Test: manual
Change-Id: I63402ee8ffa8f57a70a9c9aaa0370d8ca599bbea
Jakub Pawlowski [Sat, 30 Sep 2017 00:41:40 +0000 (00:41 +0000)]
Merge "Remove unused events handler for BLE scan clients" am:
509e6a2c74
am:
b839517a62
Change-Id: I393b5b3fd2f3e5dd8591c2637d6a785b569fcc9a
Pavlin Radoslavov [Sat, 30 Sep 2017 00:41:17 +0000 (00:41 +0000)]
Remove casts to (tBTA_GATTC*) unions to avoid unaligned accesses am:
b147c652e9
am:
7d9908e995
Change-Id: Ib9bdb4c2b1acbbe18db109e97937abac79fa389a
Pavlin Radoslavov [Sat, 30 Sep 2017 00:40:51 +0000 (00:40 +0000)]
Merge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client"" am:
0ad77074e0
am:
93b06f4f92
Change-Id: Id4f80c7502146991acdbb20cc80a4581f5d5bc67
Jakub Pawlowski [Fri, 29 Sep 2017 23:27:57 +0000 (23:27 +0000)]
Merge "Remove unused events handler for BLE scan clients"
am:
509e6a2c74
Change-Id: If141f51dec219c5e352c628304969376a339dfde
Treehugger Robot [Fri, 29 Sep 2017 23:17:41 +0000 (23:17 +0000)]
Merge "Remove unused events handler for BLE scan clients"
Pavlin Radoslavov [Fri, 29 Sep 2017 22:05:24 +0000 (22:05 +0000)]
Remove casts to (tBTA_GATTC*) unions to avoid unaligned accesses
am:
b147c652e9
Change-Id: Icc5d3a3b875c1f710f0a07c3c0c93aa134f272b5
Pavlin Radoslavov [Fri, 29 Sep 2017 22:03:40 +0000 (22:03 +0000)]
Merge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""
am:
0ad77074e0
Change-Id: I458693e4cc88d3b9cac7425d4321a1a0b5ee0fb4
Pavlin Radoslavov [Fri, 29 Sep 2017 01:11:06 +0000 (18:11 -0700)]
Remove casts to (tBTA_GATTC*) unions to avoid unaligned accesses
Bug:
65381426
Test: unit tests
Change-Id: I37e89ec7187ab1c61be4c736385a9fc5ec88d737
Pavlin Radoslavov [Fri, 29 Sep 2017 21:44:59 +0000 (21:44 +0000)]
Merge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""
Jakub Pawlowski [Fri, 29 Sep 2017 21:20:21 +0000 (21:20 +0000)]
Merge "UUID fix string parsing" am:
655c74d5bd
am:
91490989b0
Change-Id: I3133c86b5a2b296988b7bbc02449ef6972095e62
Jakub Pawlowski [Fri, 29 Sep 2017 21:17:19 +0000 (21:17 +0000)]
Merge "UUID fix string parsing"
am:
655c74d5bd
Change-Id: I21c340293b72128d52dfd8006eaa577cbc1b9435
Treehugger Robot [Fri, 29 Sep 2017 21:07:57 +0000 (21:07 +0000)]
Merge "UUID fix string parsing"
Jakub Pawlowski [Fri, 29 Sep 2017 20:48:38 +0000 (13:48 -0700)]
Remove unused events handler for BLE scan clients
These events should be handled only for GATT clients, not for BLE
scanner.
Bug:
67058417
Test: compilation
Change-Id: I70744d3c6fd7eb40d839863f7413a7521ca0b2e9
Pavlin Radoslavov [Fri, 29 Sep 2017 00:30:13 +0000 (17:30 -0700)]
Revert "Fix stack-buffer-overflow in bluetooth service GATT client"
Instead of a calling site fix, a fix will be added to the called
function instead.
This reverts commit
998f78519d4ca9aad5a7105c8064c6a08342e98c.
Jakub Pawlowski [Fri, 29 Sep 2017 19:11:42 +0000 (12:11 -0700)]
UUID fix string parsing
Instead of making assumption about null termination to make sure proper
number of characters were consumed in sscanf, just ask it to provide the
total number of characters parsed
Test: unittest net_test_types net_test_storage
Change-Id: I2a71c6a15774f73e0ed294d2646884e768ff30d2
Dan Willemsen [Fri, 29 Sep 2017 14:53:02 +0000 (14:53 +0000)]
Remove default libraries am:
3f02f4791b
am:
9e6b6e67fe
Change-Id: I2739da1c82a060e65261eebeff25e2dc254611dd
Chao Quan [Fri, 29 Sep 2017 14:52:32 +0000 (14:52 +0000)]
Fix condition of adding device to resloving list am:
6738c83f8e
am:
8c87f08067
Change-Id: Iad9681a2447a238e89e99717d6b9b32bd10e64a0
Chao Quan [Fri, 29 Sep 2017 14:52:27 +0000 (14:52 +0000)]
Refactor btm_ble_resolving_list_load_dev am:
06d4a42ac2
am:
cc8271c7e9
Change-Id: I0ab854ab339ef67a6669d8025c3d3a4a17631e59
Dan Willemsen [Fri, 29 Sep 2017 04:58:08 +0000 (04:58 +0000)]
Remove default libraries
am:
3f02f4791b
Change-Id: I4d3aa9d9116ac915a088647496d1b564bcac8d76
Chao Quan [Fri, 29 Sep 2017 03:23:57 +0000 (03:23 +0000)]
Fix condition of adding device to resloving list
am:
6738c83f8e
Change-Id: If04697a1d9e5e59426183a7284922d78dc1be018
Chao Quan [Fri, 29 Sep 2017 03:23:52 +0000 (03:23 +0000)]
Refactor btm_ble_resolving_list_load_dev
am:
06d4a42ac2
Change-Id: Ie015e1f0876aebafedcb04e8770cb0edd16f6f7f
Dan Willemsen [Fri, 29 Sep 2017 00:12:28 +0000 (17:12 -0700)]
Remove default libraries
libdl is part of system_shared_libs now. -ldl -lpthread -lm are now defaults
for host_ldlibs on Linux and Darwin. -lrt is a default for host_ldlibs on
Linux.
Test: m host
Change-Id: Ie87f6ff4290d18e099e1be92093b86f743296563
Exempt-From-Owner-Approval: build system cleanup
Chao Quan [Thu, 28 Sep 2017 17:15:32 +0000 (10:15 -0700)]
Fix condition of adding device to resloving list
Initial conditions:
1. A phone with a bt controller which doesn't support LE
privacy feature.
2. A HOGP mouse which doesn't exchange identity informatin
(IRK & indentity address)to phone
Reproduce procedure:
1. phone pair with mouse.
2. Disconnect profile link to mouse.
3. re-initiate connect to mouse.
Result: Can't connect to mouse
After bond done, stack will try to add the bonded device
to resolving list. But in the condition that controller
doesn't support LE privacy, stack adds a record with a dummy
static address. When re-initiate connection to this device,
stack will use this dummy static address, and connection
fail.
Fix the related condition
Test: manual
Change-Id: I82621c57c54667294912d4270be10299e8029b4a
Chao Quan [Fri, 11 Aug 2017 03:30:59 +0000 (11:30 +0800)]
Refactor btm_ble_resolving_list_load_dev
Test: compilation
Change-Id: I69fd4d9df63801bcc8b529d95bee74fd06c86249
Ivan Podogov [Thu, 28 Sep 2017 04:23:01 +0000 (04:23 +0000)]
Merge "HIDD: Auto-plug and accept incoming connections" am:
34b1bed0d2
am:
5fa280a530
Change-Id: I2b96bcb106f109be88b386d412bc211f6cf2d1c8
Ivan Podogov [Thu, 28 Sep 2017 04:20:28 +0000 (04:20 +0000)]
Merge "HIDD: Auto-plug and accept incoming connections"
am:
34b1bed0d2
Change-Id: Ie83a77c83959d83b60e7e1eabbb08e886c4188a0
Treehugger Robot [Thu, 28 Sep 2017 04:16:02 +0000 (04:16 +0000)]
Merge "HIDD: Auto-plug and accept incoming connections"
Jack He [Thu, 28 Sep 2017 03:31:27 +0000 (03:31 +0000)]
Fix Linux build am:
fd45611d6c
am:
87331bef85
Change-Id: I6d587f2e8e832e67e4da7000e37a060f5d79a7ac
Jack He [Thu, 28 Sep 2017 03:25:47 +0000 (03:25 +0000)]
Fix Linux build
am:
fd45611d6c
Change-Id: Iec5f76d31645149f7b81a0f695e808a6ec19a260
Jack He [Thu, 28 Sep 2017 01:25:56 +0000 (18:25 -0700)]
Fix Linux build
* UUID source files
* L2CAP UCD source files
Test: build on linux
Change-Id: Iba6d8d082612c62e5a8d552140c86ed242da0e36
Jakub Pawlowski [Thu, 28 Sep 2017 01:09:46 +0000 (01:09 +0000)]
Merge "Don't set CT2 bit when talking to pre-5.0 devices" am:
88f7ae508d
am:
a24611631e
Change-Id: Ib11d4e99cc6d0e092aecb8e872c62f1bd4406730
Jakub Pawlowski [Thu, 28 Sep 2017 01:07:48 +0000 (01:07 +0000)]
Merge "Don't set CT2 bit when talking to pre-5.0 devices"
am:
88f7ae508d
Change-Id: I1d1f343ea5fffa7312662670f30079ff7ea9bce9
Treehugger Robot [Thu, 28 Sep 2017 01:01:30 +0000 (01:01 +0000)]
Merge "Don't set CT2 bit when talking to pre-5.0 devices"
Yamei Du [Thu, 28 Sep 2017 00:22:31 +0000 (00:22 +0000)]
Fix out-of-bounds reading when copy SDP raw data am:
04da67a727
am:
ff2c325ab3
Change-Id: I10c2a9993b1d5215bb209082ea833c335f4d13f5
Yamei Du [Thu, 28 Sep 2017 00:19:30 +0000 (00:19 +0000)]
Fix out-of-bounds reading when copy SDP raw data
am:
04da67a727
Change-Id: I7b26a6a14ff83632e6f4fe9ad3f0a0a8af80fada
Jakub Pawlowski [Wed, 27 Sep 2017 22:41:13 +0000 (15:41 -0700)]
Don't set CT2 bit when talking to pre-5.0 devices
Prior to 5.0 spec, CT2 bit in AuthReq was reserved. Setting it cause
bonding failure with devices that handle it incorrectly.
Bug:
66179701
Bug:
66931978
Test: Bond with device that have 4.2 chip
Change-Id: Idbbf2c39c499698844218059a35cb686996c136a
Yamei Du [Sat, 27 May 2017 02:41:42 +0000 (10:41 +0800)]
Fix out-of-bounds reading when copy SDP raw data
When no attribute is returned in the SDP response, the cpy_len will be
MAX_DISC_RAW_DATA_BUF, this will cause out-of-bonds reading of source
buffer when copy the response raw data.
Change-Id: I923d8ee7e08f935e13cec38b75a04beca6174452
Myles Watson [Wed, 27 Sep 2017 21:15:32 +0000 (21:15 +0000)]
SMP: Use tSMP_INT_DATA instead of void am:
5ce55bd2e0
am:
2f331b07c8
Change-Id: I6b08ed0c04d1cc8fb7a362a4d4152790e6646a17
Myles Watson [Wed, 27 Sep 2017 21:13:21 +0000 (21:13 +0000)]
SMP: Use tSMP_INT_DATA instead of void
am:
5ce55bd2e0
Change-Id: I1f1ff8a75d6766a5b7a7fc0a0d9a100bf5d4a9a4
Myles Watson [Wed, 20 Sep 2017 23:41:19 +0000 (16:41 -0700)]
SMP: Use tSMP_INT_DATA instead of void
Test: pairing sanity
Change-Id: Ie3a2f94ddd718344219760cef7f1477bd4d09e00
Ivan Podogov [Tue, 26 Sep 2017 10:42:41 +0000 (11:42 +0100)]
HIDD: Auto-plug and accept incoming connections
Linux, Windows, and OSX try to connect with HID devices during
pairing. We should auto-plug and accept incoming connections if
there is currently no device connected.
In case of Windows, if it fails to connect the first time right
after pairing, all future connections are guaranteed to fail:
hangs in the "response pending" state at L2CAP connection, right
after SECURITY_COMPLETE, looks like a bug in Windows stack.
Since we always have a plugged, "in_use" device in registered
state, we won't be able to accept a new incoming connection,
unless we don't have any other paired device at all. This check
should be removed to allow smoother pairing experience and fix
Windows compatibility.
Bug:
66940516
Test: manual, with a test app
Change-Id: Ie6ca639cb120b52f59880fadb4d3654a095664d6
Jack He [Wed, 27 Sep 2017 20:17:02 +0000 (20:17 +0000)]
L2CAP: Remove UCD related flags am:
3992f45f86
am:
527f5d6945
Change-Id: I4cf350ebe8822b4389a8bd8b75f3e3ec0b8ad148
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:12:34 +0000 (20:12 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
d98dac4396
am:
7820d2eed0
Change-Id: Ib013e5346fc424821acbdd9c5fa92390dbda98e8
Jack He [Wed, 27 Sep 2017 20:09:24 +0000 (20:09 +0000)]
L2CAP: Remove UCD related flags
am:
3992f45f86
Change-Id: I9e040eafa6fb526e32d360c318913454ab2b715d
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:43 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am:
d98dac4396
Change-Id: Ie7bb897b534f65503cd626c6c958a16e6b3a7209
Jack He [Thu, 21 Sep 2017 00:06:42 +0000 (17:06 -0700)]
L2CAP: Remove UCD related flags
* L2CAP UCD (Unicast Connectionless Data) is no longer enabled on the
stack
* L2CAP_UCD_INCLUDED is always FALSE, the TRUE case should be removed
* As result, L2CAP_UCD_MTU, L2CAP_UCD_IDLE_TIMEOUT, and
L2CAP_UCD_CH_PRIORITY need to be removed as well
Bug:
66244184
Test: build
Change-Id: Ieee8b3a547653efa3a34a0810c415ba4c32f1be7
Treehugger Robot [Wed, 27 Sep 2017 19:43:18 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
Jakub Pawlowski [Wed, 27 Sep 2017 19:07:04 +0000 (19:07 +0000)]
Merge "Fix GATT Characteristic discovery (server side)" am:
1c0dae6145
am:
ea6c79daf4
Change-Id: I47feedd93dc1fd46eb7af73031a124e8f63063ad
Jakub Pawlowski [Wed, 27 Sep 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Fix GATT Characteristic discovery (server side)"
am:
1c0dae6145
Change-Id: Ic0dc0eb7f321db75fd0bfc90bff9423a7b1147c0
Treehugger Robot [Wed, 27 Sep 2017 18:55:30 +0000 (18:55 +0000)]
Merge "Fix GATT Characteristic discovery (server side)"
Myles Watson [Wed, 27 Sep 2017 17:33:18 +0000 (17:33 +0000)]
Remove casts to unions to avoid unaligned accesses am:
8d749047a0
am:
30f8ab74d9
Change-Id: I8dfedd6b52d2ebf638b7d7c222510fdd4ad70938
Myles Watson [Wed, 27 Sep 2017 17:28:19 +0000 (17:28 +0000)]
Remove casts to unions to avoid unaligned accesses
am:
8d749047a0
Change-Id: Ib7bd6211720191bcc0dcbfeb2dcb5495fb55cad8
Jakub Pawlowski [Wed, 27 Sep 2017 16:58:46 +0000 (09:58 -0700)]
Fix GATT Characteristic discovery (server side)
The pointer was not properly incremented, which resulted in trashes
being sent during GATT discovery.
This issue was introduced in commit
819e2ecb84a22d6e03ec9ed67b3260c0dd7e8aba (Use one type for UUID)
Bug:
66912853
Test: sl4a GATT read test
Change-Id: Ib57ad050ff17852f9b2fec9c51cad246235e3e80
Pulkit Bhuwalka [Thu, 14 Sep 2017 02:25:31 +0000 (19:25 -0700)]
Modify Bluetooth Class of Device from Android stack
Adds ability to modify Bluetooth Class of Device from Android stack by
hooking into existing functions to modify adapter properties. This
ensures the hardware HAL bluetooth.h interface does not have to change.
Bug:
36015415
Test: Modified Class of Device using sample app and verified device icon
change when discovering from a remote device.
Change-Id: Ib5f05741480a27431afea882d071ded4a6b1bdb8
Myles Watson [Tue, 19 Sep 2017 17:01:28 +0000 (10:01 -0700)]
Remove casts to unions to avoid unaligned accesses
Bug:
65392204
Test: sanity
Change-Id: I2886cc02289b68710e83147ba4d7715a32a4fc55
Jakub Pawlowski [Tue, 26 Sep 2017 23:16:05 +0000 (23:16 +0000)]
Remove unnecesary BTA redefinitions for GATT part 4 am:
50ba9031b4
am:
f7fe18a4b7
Change-Id: I173f664d05ba5eb851cadcdd32a2d760ac81cadd
Jakub Pawlowski [Tue, 26 Sep 2017 23:16:01 +0000 (23:16 +0000)]
Remove unnecesary BTA redefinitions for GATT part 3 am:
ee9a11f903
am:
1006851a6a
Change-Id: I77bca0a70d92e842724c30515840cc73ebe6e29c
Jakub Pawlowski [Tue, 26 Sep 2017 23:15:44 +0000 (23:15 +0000)]
Remove unnecesary BTA redefinitions for GATT part 2 am:
e9ef00c3fb
am:
3041f65216
Change-Id: I2decc58bbbb4cc55b3ec2173ab70001a91e51a81
Jakub Pawlowski [Tue, 26 Sep 2017 23:10:57 +0000 (23:10 +0000)]
Remove unnecesary BTA redefinitions for GATT part 1 am:
ab7a368f3f
am:
336f58333f
Change-Id: I4032e3a47085fabce3aca5b2a58562a3549074d0
Jakub Pawlowski [Tue, 26 Sep 2017 23:08:15 +0000 (23:08 +0000)]
Remove unnecesary BTA redefinitions for GATT part 4
am:
50ba9031b4
Change-Id: Iec52c13db939ccfe3da63034661ef75fcde20265
Jakub Pawlowski [Tue, 26 Sep 2017 23:08:11 +0000 (23:08 +0000)]
Remove unnecesary BTA redefinitions for GATT part 3
am:
ee9a11f903
Change-Id: Ibc1c7a7586b6b1eda5f01be22bddc6447be79133
Jakub Pawlowski [Tue, 26 Sep 2017 23:07:04 +0000 (23:07 +0000)]
Remove unnecesary BTA redefinitions for GATT part 2
am:
e9ef00c3fb
Change-Id: I052607160b33ba78f153b68e018940d602e18254
Jakub Pawlowski [Tue, 26 Sep 2017 23:07:00 +0000 (23:07 +0000)]
Remove unnecesary BTA redefinitions for GATT part 1
am:
ab7a368f3f
Change-Id: Icb345dbfb20e26275cdb77e34f5d9e214d65eb03
Jakub Pawlowski [Tue, 26 Sep 2017 15:45:20 +0000 (08:45 -0700)]
Remove unnecesary BTA redefinitions for GATT part 4
Test: compilation test
Change-Id: Ibe37a1c6506d567b68497e8c7074d90cd73ddf00
Jakub Pawlowski [Tue, 26 Sep 2017 01:47:54 +0000 (18:47 -0700)]
Remove unnecesary BTA redefinitions for GATT part 3
Test: compilation test
Change-Id: I8d4b8cfd35fcb5ccd7067f1e02dedd1a58efa3ad
Jakub Pawlowski [Tue, 26 Sep 2017 00:41:21 +0000 (17:41 -0700)]
Remove unnecesary BTA redefinitions for GATT part 2
Test: compilation test
Change-Id: Iaf81188596c33b92f79f163dc95187ed5c6f52a4
Jakub Pawlowski [Tue, 26 Sep 2017 00:24:46 +0000 (17:24 -0700)]
Remove unnecesary BTA redefinitions for GATT part 1
Test: compilation test
Change-Id: I98ab63a187684ae4ffbb0cb23e5c9e67994be468
Jakub Pawlowski [Tue, 26 Sep 2017 11:06:12 +0000 (11:06 +0000)]
Build fix after UUID refactor for stage branch am:
30be4b9f9c
am:
23da4b4420
Change-Id: Idbd1a4759695753ccf4e615c4c28da2acd393b3e
Jakub Pawlowski [Tue, 26 Sep 2017 10:55:06 +0000 (10:55 +0000)]
Build fix after UUID refactor for stage branch
am:
30be4b9f9c
Change-Id: I65278615668f57dd0e3f91cfeb726ef291509ea2
Jakub Pawlowski [Tue, 26 Sep 2017 05:19:01 +0000 (22:19 -0700)]
Build fix after UUID refactor for stage branch
Change-Id: Ia01fa17ba40d315a912c391211e101a951eab562
Jakub Pawlowski [Tue, 26 Sep 2017 00:15:30 +0000 (00:15 +0000)]
resolve merge conflicts of
819e2ecb8 to stage-aosp-master
am:
c7897e9511
Change-Id: Ibe6c576c39cc2c4ba17fa6374fc2548ce4180f4b
Jakub Pawlowski [Tue, 26 Sep 2017 00:10:29 +0000 (17:10 -0700)]
resolve merge conflicts of
819e2ecb8 to stage-aosp-master
Test: I tested this conflict resolution.
Change-Id: Id915d1a9011dba4b898d47f5e6d6546079733a4c
Jakub Pawlowski [Mon, 10 Jul 2017 16:56:09 +0000 (09:56 -0700)]
Use one type for UUID (1/5)
Currently, we have few different representations for UUID in stack:
tBT_UUID, tSDP_UUID, bt_uuid_t, bluetooth:UUID, or uint8_t*.
Additionally, tBT_UUID and bt_uuid_t are used to hold UUID as 128bit
as Little Endian or Big Endian, depending on which part of stack (GATT
or SDP) is using it.
This patch is creating one type, bluetooth::Uuid, that will replace all
other types.
Bug:
66912853
Test: all sl4a tests for GATT and RFCOMM
Merged-In: Ia42d3233146db0488728ed6f878f99b368fe8838
Change-Id: Ia42d3233146db0488728ed6f878f99b368fe8838
Andre Eisenbach [Fri, 22 Sep 2017 20:19:44 +0000 (20:19 +0000)]
Fix build error for AVRCP13 compat fix am:
544f7e1be9
am:
7b1e826e9c
Change-Id: I174dd3f701a429cc8c31136bfebf5314d9231c5d