OSDN Git Service
tedwang [Thu, 17 May 2018 13:58:22 +0000 (06:58 -0700)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID" into pi-dev am:
f1ae2359c5
am:
f6531734ea
Change-Id: Ief63a75a7d802c407902a6364efa64e7e0b31866
tedwang [Thu, 17 May 2018 13:57:45 +0000 (06:57 -0700)]
Merge "Add General Reject for invalid PDU ID" into pi-dev am:
759463fbd7
am:
b834537f9c
Change-Id: Ie2445aed2e0ff5fd2f56873de2f6350ddba831d2
Hansong Zhang [Thu, 17 May 2018 13:56:46 +0000 (06:56 -0700)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID" into pi-dev am:
0f2fef3bfa
am:
b19e3b3924
Change-Id: Iff9dda28e2e018c6e0ad7c317afef6944f99ea0d
Hansong Zhang [Thu, 17 May 2018 13:56:23 +0000 (06:56 -0700)]
Merge "AVRCP: Respond UID Changed for invalid Get Item Attributes command" into pi-dev am:
e5c4f78345
am:
fc36054dc1
Change-Id: I7716ba0ee6f59926a3c8ea967f277601812dcc15
tedwang [Thu, 17 May 2018 13:47:56 +0000 (06:47 -0700)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID" into pi-dev
am:
f1ae2359c5
Change-Id: Ib45ab00fcb68ba2e212372e457169c60e0c8dd27
tedwang [Thu, 17 May 2018 13:47:23 +0000 (06:47 -0700)]
Merge "Add General Reject for invalid PDU ID" into pi-dev
am:
759463fbd7
Change-Id: Ie32a40d584c86d5d5d34785b4718ec2f866a8000
Hansong Zhang [Thu, 17 May 2018 13:46:15 +0000 (06:46 -0700)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID" into pi-dev
am:
0f2fef3bfa
Change-Id: I844366fdadf2e6ac343a6856c556949c0c03b2ea
Hansong Zhang [Thu, 17 May 2018 13:45:45 +0000 (06:45 -0700)]
Merge "AVRCP: Respond UID Changed for invalid Get Item Attributes command" into pi-dev
am:
e5c4f78345
Change-Id: Ie5de37208a6028405900255045cee1ecc2af1d1c
TreeHugger Robot [Thu, 17 May 2018 13:32:39 +0000 (13:32 +0000)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID" into pi-dev
TreeHugger Robot [Thu, 17 May 2018 13:32:20 +0000 (13:32 +0000)]
Merge "Add General Reject for invalid PDU ID" into pi-dev
TreeHugger Robot [Thu, 17 May 2018 13:31:13 +0000 (13:31 +0000)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID" into pi-dev
Pavlin Radoslavov [Thu, 17 May 2018 13:31:12 +0000 (06:31 -0700)]
[automerger skipped] Don't update the MTU across multiple A2DP connections that are open am:
fb691de015 -s ours
am:
dd2634bea8 -s ours
Change-Id: Ie9a9b25231dae2852182af59f605adb1381754c2
TreeHugger Robot [Thu, 17 May 2018 13:30:21 +0000 (13:30 +0000)]
Merge "AVRCP: Respond UID Changed for invalid Get Item Attributes command" into pi-dev
Pavlin Radoslavov [Thu, 17 May 2018 13:17:39 +0000 (06:17 -0700)]
[automerger skipped] Don't update the MTU across multiple A2DP connections that are open
am:
fb691de015 -s ours
Change-Id: I73a525a744d50526b4dabd0eb4b04376e57bada9
Pavlin Radoslavov [Wed, 16 May 2018 21:09:48 +0000 (14:09 -0700)]
Don't update the MTU across multiple A2DP connections that are open am:
1200c75df8 am:
fd90d087f1
am:
3970d6d597
Change-Id: Ia40397883b2bc2bff885a6cea046ca9c2056dfc3
Pavlin Radoslavov [Wed, 16 May 2018 02:21:03 +0000 (19:21 -0700)]
Don't update the MTU across multiple A2DP connections that are open
Remove function bta_av_chk_mtu() that updates the MTU to the smallest
value across all open A2DP connections, because that function is not needed.
Such MTU update is problematic for Multi-A2DP, because some codecs cannot
be initialized/used if the MTU is too small. E.g., for LDAC the
MTU value used for the codec initialization must be at least 679.
Bug:
79675742
Test: Manual - (1)Connect Bose QC35; (2)Connect Sony SRS-XB2; (3)Play music
Change-Id: I8048a1bf6df6d4d6291bf3570a95b5182af15b6a
Merged-In: I8048a1bf6df6d4d6291bf3570a95b5182af15b6a
(cherry picked from commit
1200c75df85ac3d4f49b91039334077ada60e0cb)
Pavlin Radoslavov [Wed, 16 May 2018 20:52:13 +0000 (13:52 -0700)]
Don't update the MTU across multiple A2DP connections that are open am:
1200c75df8
am:
fd90d087f1
Change-Id: I3abc1367524d8fa3cf7cd3b256c9eba9d10b7606
Pavlin Radoslavov [Wed, 16 May 2018 20:48:39 +0000 (13:48 -0700)]
Don't update the MTU across multiple A2DP connections that are open
am:
1200c75df8
Change-Id: Ia64122410907b4ab25b6c1efd29b9459d9a6b45f
tedwang [Tue, 15 May 2018 14:21:39 +0000 (22:21 +0800)]
Add General Reject for invalid PDU ID
Add Avrcp Browse General Reject packet
Respond general reject when undefined AVRCP Browsing PDU ID sent from
remote.
Bug:
79376704
Test: run host native test net_test_btpackets
Change-Id: I8a44d8e3f0cc5fac89e23217726c76ede4aff916
Pavlin Radoslavov [Wed, 16 May 2018 02:21:03 +0000 (19:21 -0700)]
Don't update the MTU across multiple A2DP connections that are open
Remove function bta_av_chk_mtu() that updates the MTU to the smallest
value across all open A2DP connections, because that function is not needed.
Such MTU update is problematic for Multi-A2DP, because some codecs cannot
be initialized/used if the MTU is too small. E.g., for LDAC the
MTU value used for the codec initialization must be at least 679.
Bug:
79675742
Test: Manual - (1)Connect Bose QC35; (2)Connect Sony SRS-XB2; (3)Play music
Change-Id: I8048a1bf6df6d4d6291bf3570a95b5182af15b6a
Pavlin Radoslavov [Wed, 16 May 2018 01:57:13 +0000 (18:57 -0700)]
[automerger skipped] Merge "Print extra error code if LDAC encoder fails to initialize" into pi-dev am:
ca2d3b62be -s ours
am:
05d914a14f -s ours
Change-Id: Id1cde778ad89ab5bba6b75622abb04a9e3e3daa3
Hemant Gupta [Wed, 16 May 2018 01:49:26 +0000 (18:49 -0700)]
HID: Update state to disconnected in virtual unplug am:
53c7924cb2
am:
a5ccf6ce89
Change-Id: I0ea8e006ecc57da055baa423c9837b157159e423
Pavlin Radoslavov [Wed, 16 May 2018 01:49:02 +0000 (18:49 -0700)]
[automerger skipped] Merge "Print extra error code if LDAC encoder fails to initialize" into pi-dev
am:
ca2d3b62be -s ours
Change-Id: Iec541681ea71a08d2ca3f1457886665fee8fd9de
TreeHugger Robot [Wed, 16 May 2018 01:34:58 +0000 (01:34 +0000)]
Merge "Print extra error code if LDAC encoder fails to initialize" into pi-dev
Hemant Gupta [Wed, 16 May 2018 01:25:28 +0000 (18:25 -0700)]
HID: Update state to disconnected in virtual unplug
am:
53c7924cb2
Change-Id: I7727c35cc81f732fc8385cb236fc951e5b8381d9
tedwang [Wed, 16 May 2018 00:47:26 +0000 (17:47 -0700)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID" am:
4298549380 am:
0244fc1c1f
am:
5fa6170632
Change-Id: I2b6032f0540f46e8918560f263a50427dea02f43
Pavlin Radoslavov [Wed, 16 May 2018 00:45:35 +0000 (17:45 -0700)]
Merge "Print extra error code if LDAC encoder fails to initialize" am:
3a537a3e07 am:
c31fde65c7
am:
311814385d
Change-Id: I27ea1c06ba3cf1198660393fd3fb35d16889820e
tedwang [Wed, 16 May 2018 00:29:22 +0000 (17:29 -0700)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID" am:
4298549380
am:
0244fc1c1f
Change-Id: I79efd457de254a5239dc78c553e214197fe27b7f
tedwang [Wed, 16 May 2018 00:24:45 +0000 (17:24 -0700)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID"
am:
4298549380
Change-Id: I4e02d05557fc9d3cb9d052c633f0e496f849334c
Pavlin Radoslavov [Wed, 16 May 2018 00:16:47 +0000 (17:16 -0700)]
Merge "Print extra error code if LDAC encoder fails to initialize" am:
3a537a3e07
am:
c31fde65c7
Change-Id: I0e607f0361c2de6a089cb9d03e45b4a58b37b903
Treehugger Robot [Wed, 16 May 2018 00:12:44 +0000 (00:12 +0000)]
Merge "Respond reject with INVALID_PARAMETER when register for invalid event ID"
Pavlin Radoslavov [Wed, 16 May 2018 00:05:35 +0000 (17:05 -0700)]
Merge "Print extra error code if LDAC encoder fails to initialize"
am:
3a537a3e07
Change-Id: I6dd95962d924044315b90a52ada37a8fc3c5b21a
Hansong Zhang [Tue, 15 May 2018 23:50:59 +0000 (16:50 -0700)]
AVRCP: Respond UID Changed for invalid Get Item Attributes command am:
335d6e62b0 am:
ac5adbde45
am:
43ac963a53
Change-Id: Iceb456e3a6b85056a0e6308601233d0a6c8954ff
Pavlin Radoslavov [Tue, 15 May 2018 10:19:41 +0000 (03:19 -0700)]
Print extra error code if LDAC encoder fails to initialize
Also, add a missing CHECK() assert that the LDAC handle is valid.
Bug:
79675742
Test: Code compilation
Change-Id: I4bd51ed978eadc2aecc27d199e6f01bb31c9a631
Merged-In: I4bd51ed978eadc2aecc27d199e6f01bb31c9a631
(cherry picked from commit
d963d2b2827aa6f1638eaa87597f28bb9d7a88d4)
Treehugger Robot [Tue, 15 May 2018 23:21:27 +0000 (23:21 +0000)]
Merge "Print extra error code if LDAC encoder fails to initialize"
tedwang [Tue, 15 May 2018 23:21:12 +0000 (16:21 -0700)]
Add respond Reject with Invalid parameter for Unknown Capability ID am:
bf514e3954 am:
da4e76d165
am:
659d72d979
Change-Id: I6febcc24cbb70af820b33ed9426d4de3b375c381
tedwang [Tue, 15 May 2018 07:25:11 +0000 (15:25 +0800)]
Respond reject with INVALID_PARAMETER when register for invalid event ID
It should respond reject with INVALID_PARAMETER instead of
INVALID_COMMAND while remote registering for an invalid event ID
Bug:
79377562
Test: PTS AVRCP/TG/NFY/BI-01-C
Change-Id: Ic006cb2f6584216f9457af5576dd2d39adaa3cf5
(cherry picked from commit
d51c1dc6777eeb4d414c67e38999af436aaf71a8)
tedwang [Tue, 15 May 2018 07:25:11 +0000 (15:25 +0800)]
Respond reject with INVALID_PARAMETER when register for invalid event ID
It should respond reject with INVALID_PARAMETER instead of
INVALID_COMMAND while remote registering for an invalid event ID
Bug:
79377562
Test: PTS AVRCP/TG/NFY/BI-01-C
Change-Id: Ic006cb2f6584216f9457af5576dd2d39adaa3cf5
Hansong Zhang [Tue, 15 May 2018 22:35:33 +0000 (15:35 -0700)]
AVRCP: Respond UID Changed for invalid Get Item Attributes command am:
335d6e62b0
am:
ac5adbde45
Change-Id: Ic41890ca881353914d4937b61a81f75e289c982b
tedwang [Tue, 15 May 2018 22:35:02 +0000 (15:35 -0700)]
Add respond Reject with Invalid parameter for Unknown Capability ID am:
bf514e3954
am:
da4e76d165
Change-Id: Idf42383c603ec63acbfd3f20614b7562a1caa5fa
Hansong Zhang [Tue, 15 May 2018 22:29:52 +0000 (15:29 -0700)]
AVRCP: Respond UID Changed for invalid Get Item Attributes command
am:
335d6e62b0
Change-Id: I90881349400f9d62723119fda172255bae1801b9
tedwang [Tue, 15 May 2018 22:29:28 +0000 (15:29 -0700)]
Add respond Reject with Invalid parameter for Unknown Capability ID
am:
bf514e3954
Change-Id: I03cf9138cf3d7049cef4375a450d05dba36d5215
Hansong Zhang [Tue, 15 May 2018 21:35:53 +0000 (14:35 -0700)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID" am:
3103d311f4 am:
ea82a8308d
am:
3e942d40ec
Change-Id: Ie5f573a64869e6102ecca251095a38365f69a261
Claire Treyz [Tue, 15 May 2018 21:26:08 +0000 (14:26 -0700)]
Use identity addr in BLE scan filter am:
9183ce4961
am:
e7bc6aa854
Change-Id: I48a3ea7d99ac558a68f8175b521c3e5a0bc2b3c5
Hansong Zhang [Tue, 15 May 2018 20:45:02 +0000 (13:45 -0700)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID" am:
3103d311f4
am:
ea82a8308d
Change-Id: I4b7f286570f2ef65e7574f809b80c61890154009
Hansong Zhang [Mon, 14 May 2018 18:29:20 +0000 (11:29 -0700)]
AVRCP: Respond UID Changed for invalid Get Item Attributes command
When we receive GetItenAttributes command with an invalid UidCounter
other than 0x0000, we should reply UID Changed (0x05)
Bug:
79270308
Test: PTS AVRCP/TG/MCN/CB/BI-05-C; unit test
Change-Id: I819991d083944de5a08b0cd4fd0fb33c63f0142a
(cherry picked from commit
335d6e62b0fe2d81375254c9c5114867d524fc19)
Hansong Zhang [Mon, 14 May 2018 18:29:20 +0000 (11:29 -0700)]
AVRCP: Respond UID Changed for invalid Get Item Attributes command
When we receive GetItenAttributes command with an invalid UidCounter
other than 0x0000, we should reply UID Changed (0x05)
Bug:
79270308
Test: PTS AVRCP/TG/MCN/CB/BI-05-C; unit test
Change-Id: I819991d083944de5a08b0cd4fd0fb33c63f0142a
Hansong Zhang [Tue, 15 May 2018 20:29:28 +0000 (13:29 -0700)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID"
am:
3103d311f4
Change-Id: I1bb359ff06ed6414ccc0c6440a2b9000caba871b
Hemant Gupta [Fri, 2 Mar 2018 04:59:25 +0000 (10:29 +0530)]
HID: Update state to disconnected in virtual unplug
Usecase:
1.Pair and connect DUT with Remote device
2.Disconnect Remote device from DUT (Settings menu)
3.Connect to Remote device from settings menu when Remote will not be
advertising.
4.With in 30 secs of connect command, delete the stored link key and then pair
and connect again to Remote device from settings menu
(when RD is advertising).
Expected Result:
Remote device should connect successfully.
Observed Result:
Remote device is shown in paired devices(settings menu)but not connected.
Root cause:
When virtual unplug happens device state is not cleared properly. So next
time when we are trying to connect its going to connected state.
Fix:
Update the current device state to BTHH_CONN_STATE_CONNECTING to
BTIF_HH_DEV_DISCONNECTED when virtual unplug happens.
Test: Issue is not seen after above steps
Fixes:
74082929
Change-Id: I8a325987ff5eb0a8e4f8708fc7c76b8a9ade6ccf
(cherry picked from commit
126397bc6e8ff19bd37b0bc4b9b5db978eecb773)
Claire Treyz [Tue, 15 May 2018 20:24:16 +0000 (13:24 -0700)]
Use identity addr in BLE scan filter
am:
9183ce4961
Change-Id: I34556134d268c42275e9160931fd2eab13cc88e7
tedwang [Wed, 9 May 2018 06:28:04 +0000 (14:28 +0800)]
Add respond Reject with Invalid parameter for Unknown Capability ID
Add handle Get Capabilities with Unknown Capability ID and unit test
for this.
Bug:
79269978
Test: Run host native test net_test_avrcp
Change-Id: I2cb606bcb6462190354bb471577d9383e43649c1
(cherry picked from commit
5e872794641b89b63176befdb04865d5acf14aa3)
Hansong Zhang [Mon, 14 May 2018 23:48:58 +0000 (16:48 -0700)]
AVRCP: Verify SetBrowsedPlayer player ID
IUT should reject the invalid SetBrowsedPlayer command sent from PTS.
Bug:
79377126
Test: PTS AVRCP/TG/MPS/BI-02-C
Change-Id: I2afde442e3b3563f4a1a37e2914c9b16fe07e8fc
(cherry picked from commit
f54a72cd8dcfae62ccab5d0b03b50539dde5c520)
Treehugger Robot [Tue, 15 May 2018 20:13:30 +0000 (20:13 +0000)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID"
Hansong Zhang [Mon, 14 May 2018 23:48:58 +0000 (16:48 -0700)]
AVRCP: Verify SetBrowsedPlayer player ID
IUT should reject the invalid SetBrowsedPlayer command sent from PTS.
Bug:
79377126
Test: PTS AVRCP/TG/MPS/BI-02-C
Change-Id: I2afde442e3b3563f4a1a37e2914c9b16fe07e8fc
Pavlin Radoslavov [Tue, 15 May 2018 10:19:41 +0000 (03:19 -0700)]
Print extra error code if LDAC encoder fails to initialize
Also, add a missing CHECK() assert that the LDAC handle is valid.
Bug:
79675742
Test: Code compilation
Change-Id: I4bd51ed978eadc2aecc27d199e6f01bb31c9a631
Jakub Pawlowski [Tue, 15 May 2018 02:22:17 +0000 (19:22 -0700)]
Merge "Removed alarm callback execution statistics" am:
2190a20ef6 am:
0e812ec2c6
am:
8e11133eaa
Change-Id: I0758d7eb7408e74c960d14722d9b4c2ede97050b
Jakub Pawlowski [Tue, 15 May 2018 02:17:40 +0000 (19:17 -0700)]
Merge "Removed alarm callback execution statistics" am:
2190a20ef6
am:
0e812ec2c6
Change-Id: If4d6694f5fc54af7c8a3be0f43e7e5b8be4fe913
Jakub Pawlowski [Tue, 15 May 2018 02:12:37 +0000 (19:12 -0700)]
Merge "Removed alarm callback execution statistics"
am:
2190a20ef6
Change-Id: I12606fc5282b3c1c76d0942240f87f7a2eeec96f
Jakub Pawlowski [Tue, 15 May 2018 02:00:07 +0000 (02:00 +0000)]
Merge "Removed alarm callback execution statistics"
Jakub Pawlowski [Tue, 15 May 2018 00:08:27 +0000 (17:08 -0700)]
Merge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE" am:
ff38a2925a am:
d2c23d2fda
am:
c03e5a394c
Change-Id: Ide3afa1875a16bcb237776bcbef2faa3313fd81d
Jakub Pawlowski [Mon, 14 May 2018 23:47:49 +0000 (16:47 -0700)]
Merge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE" am:
ff38a2925a
am:
d2c23d2fda
Change-Id: I61fd5567f4c318a13b7c2875f4bc5b57cec3c509
Jakub Pawlowski [Mon, 14 May 2018 23:41:17 +0000 (16:41 -0700)]
Merge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE"
am:
ff38a2925a
Change-Id: I59cc169f1bfd172a1c2acb358f3b60ad389db562
Treehugger Robot [Mon, 14 May 2018 23:28:45 +0000 (23:28 +0000)]
Merge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE"
Jakub Pawlowski [Thu, 19 Apr 2018 09:32:40 +0000 (02:32 -0700)]
Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE
The code which handles this event is protected by an #ifdef. This was
causing connections to be established, but never detected by host.
Bug:
78264903
Test: establish connection to LE device with privacy disabled
Change-Id: Iea35016108bcbda64427250cc06258c422c1fdce
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics
Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.
Bug:
67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Jakub Pawlowski [Mon, 14 May 2018 21:20:07 +0000 (14:20 -0700)]
Merge "Use identity addr in BLE scan filter" am:
e8a0bfd2ba am:
e400111e5f
am:
88c69b9477
Change-Id: I4dde9ea46e1cb1030b93d0401d21be1521ecc690
Jakub Pawlowski [Mon, 14 May 2018 21:13:47 +0000 (14:13 -0700)]
Merge "Use identity addr in BLE scan filter" am:
e8a0bfd2ba
am:
e400111e5f
Change-Id: Ic013e242653bbbb9276b3112dceca278b1d119c3
Claire Treyz [Fri, 11 May 2018 15:13:28 +0000 (08:13 -0700)]
Use identity addr in BLE scan filter
For BT controllers with the ability to filter scans and resolve RPAs on
controller, when trying to filter for a Public ID type address the
filter must use the static identity address of the peer device instead
of the random pseudo address.
Bug:
78888800
Test: manually tested filtered scanning for BLE peer with RPA with a
device with both offloaded RPA resolution & controller filtering
supported. Tested on a device with no controller filtering, which has
no changes, as expected.
Change-Id: I1d92e219bdbc9ba2399eae637a1f4623d695a3f8
(cherry picked from commit
10704399e1cfbad3421c3272795952cad3ee2920)
Jakub Pawlowski [Mon, 14 May 2018 21:03:42 +0000 (14:03 -0700)]
Merge "Use identity addr in BLE scan filter"
am:
e8a0bfd2ba
Change-Id: Iad5b0b9d3da84e77941f369837d0cd8e71f32e4a
Jakub Pawlowski [Mon, 14 May 2018 20:47:52 +0000 (20:47 +0000)]
Merge "Use identity addr in BLE scan filter"
Ajay Panicker [Mon, 14 May 2018 20:01:28 +0000 (13:01 -0700)]
Merge "Check number of attributes before writing to a buffer" into pi-dev am:
d025c7e67f
am:
fb5fbe8c2f
Change-Id: I970fe6bf4d309f1e88dc2c209b332abf1a491348
Andre Eisenbach [Mon, 14 May 2018 20:00:20 +0000 (13:00 -0700)]
Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into pi-dev am:
b13440d973
am:
fbfa52b640
Change-Id: Ie3f6a75fa3c71e28efff40edfa7d181c08e8cb38
Ajay Panicker [Mon, 14 May 2018 19:52:17 +0000 (12:52 -0700)]
Merge "Check number of attributes before writing to a buffer" into pi-dev
am:
d025c7e67f
Change-Id: Ic3acaab298d72d0c6f709297abe46327a6f6223a
Andre Eisenbach [Mon, 14 May 2018 19:51:41 +0000 (12:51 -0700)]
Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into pi-dev
am:
b13440d973
Change-Id: I31f60ef428b01feec0416fb36bd5ce947511df6e
TreeHugger Robot [Mon, 14 May 2018 19:39:15 +0000 (19:39 +0000)]
Merge "Check number of attributes before writing to a buffer" into pi-dev
Andre Eisenbach [Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)]
Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into pi-dev
Ajay Panicker [Mon, 14 May 2018 18:55:43 +0000 (11:55 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7 am:
7860023df0 am:
1817ac9854 am:
e596981c73
am:
b3fbac073a
Change-Id: I717ef8d146ce2eeb8a5fa378aeaddc12f9ddf33a
Ajay Panicker [Mon, 14 May 2018 18:49:26 +0000 (11:49 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7 am:
7860023df0 am:
1817ac9854
am:
e596981c73
Change-Id: I449f152f3cdac1abe0e7bf7eb8bc98b336562142
Ajay Panicker [Mon, 14 May 2018 18:49:04 +0000 (11:49 -0700)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete" am:
1819a3f240 am:
4e35a128e1
am:
a4bbf2210d
Change-Id: I515cf95c2c6c2be6f9a5dbe00028a609926b88cf
Ajay Panicker [Mon, 14 May 2018 18:47:49 +0000 (11:47 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32 am:
992d901683 am:
3c6d9aef37 am:
0b97de9ce3
am:
c6eea86c84
Change-Id: I3e2be2db574f5e4d428883b9c5776844a49f57ce
Ajay Panicker [Mon, 14 May 2018 18:45:23 +0000 (11:45 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7 am:
7860023df0
am:
1817ac9854
Change-Id: I6b715a091134e48bc2c96d22134c66fc67b155c5
Ajay Panicker [Mon, 14 May 2018 18:41:20 +0000 (11:41 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7
am:
7860023df0
Change-Id: Id8004ef8b208731ba321e3abd1bb562a29f03548
Ajay Panicker [Mon, 14 May 2018 18:41:17 +0000 (11:41 -0700)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete" am:
1819a3f240
am:
4e35a128e1
Change-Id: I748d0129edbf3ca133f871509cd46a08ba5e302b
Ajay Panicker [Mon, 14 May 2018 18:37:26 +0000 (11:37 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev
am:
28af3285c7
Change-Id: I9bb0aa68376166994103a659d181e3f7f071c3b5
Ajay Panicker [Mon, 14 May 2018 18:37:17 +0000 (11:37 -0700)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete"
am:
1819a3f240
Change-Id: I0115c55090ab3a725a6c99cc9c9b0e235cc14ca2
Ajay Panicker [Mon, 14 May 2018 18:27:46 +0000 (11:27 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32 am:
992d901683 am:
3c6d9aef37
am:
0b97de9ce3
Change-Id: If3524205f1dd794ff3856c694b4c23bcc1db2ecc
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3 skipped:
ec6632f93a
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:26:16 +0000 (18:26 +0000)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete"
Ajay Panicker [Fri, 11 May 2018 19:03:07 +0000 (12:03 -0700)]
Check number of attributes before writing to a buffer
Bug:
73824150
Test: Compile
Change-Id: I2a28a503cd74758e707d1e591b55c278d2299f45
(cherry picked from commit
f6db54f071f6974e18b10bb0c2cfcf397cd4c980)
Ajay Panicker [Mon, 14 May 2018 18:19:40 +0000 (11:19 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32 am:
992d901683
am:
3c6d9aef37
Change-Id: I83ccedc2c4a6e36e66c0b398db8e2578e3c379a6
Ajay Panicker [Mon, 14 May 2018 18:15:08 +0000 (11:15 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32
am:
992d901683
Change-Id: I4822314170228bc6df8d3b60f7ee04ea4fa7c5c2
Ajay Panicker [Mon, 14 May 2018 18:11:06 +0000 (11:11 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
am:
89c77dff32
Change-Id: I50263727a1020e77133f92938f6ecf0770eef14f
Ajay Panicker [Mon, 14 May 2018 18:01:38 +0000 (18:01 +0000)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
Claire Treyz [Fri, 11 May 2018 15:13:28 +0000 (08:13 -0700)]
Use identity addr in BLE scan filter
For BT controllers with the ability to filter scans and resolve RPAs on
controller, when trying to filter for a Public ID type address the
filter must use the static identity address of the peer device instead
of the random pseudo address.
Bug:
78888800
Test: manually tested filtered scanning for BLE peer with RPA with a
device with both offloaded RPA resolution & controller filtering
supported. Tested on a device with no controller filtering, which has
no changes, as expected.
Change-Id: I1d92e219bdbc9ba2399eae637a1f4623d695a3f8
Hansong Zhang [Sat, 12 May 2018 00:22:48 +0000 (17:22 -0700)]
Merge "Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into pi-dev am:
0519b056fa
am:
4300c41b4a
Change-Id: I5d568e73cd28e7feba50f4dae2569ccf218fcaef
Pavlin Radoslavov [Sat, 12 May 2018 00:22:28 +0000 (17:22 -0700)]
[automerger skipped] Merge "Explicitly restart audio processing when switching active device" into pi-dev am:
2a8c2b2cd9 -s ours
am:
dfa37782ae -s ours
Change-Id: I4a399100e8235fabd1346a3796de90e966b8779d
Ajay Panicker [Sat, 12 May 2018 00:22:03 +0000 (17:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am:
2f9f6adfed am:
aded757078 am:
4a6c4b0c64 -s ours am:
bb23eb3daf
am:
a4f69c41f7 -s ours
Change-Id: Ia2fe73e29cf9255a372dc1bcde32e37ddd85919a
Hansong Zhang [Sat, 12 May 2018 00:21:18 +0000 (17:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev am:
cf48e73715 am:
1fc8fe3b9f am:
3e207131ab -s ours am:
b95cde5279
am:
c74ca0a3e8 -s ours
Change-Id: Ia4c236065e31a142a133fb7c9527eaa7d063c2f5
Hansong Zhang [Sat, 12 May 2018 00:20:57 +0000 (17:20 -0700)]
[automerger skipped] [automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00 am:
e719eb2c4f am:
f7ecdd2915 am:
9b5b26bc63 -s ours am:
8f9b688f61
am:
38620d4dbf -s ours
Change-Id: Iebf9b2ecddcbab725d73c043a5e65c559beb919a
Jack He [Sat, 12 May 2018 00:18:16 +0000 (17:18 -0700)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command" am:
7b958f6ea7 am:
191a9f5e42
am:
96beb134a0
Change-Id: Ibecb1aaa409325b3278665a261d1cdadfd071172