OSDN Git Service

android-x86/system-bt.git
6 years agoMerge "Use the effective peer MTU when preparing the codec configuration" am: 35b08f5708
Pavlin Radoslavov [Tue, 22 May 2018 17:44:41 +0000 (10:44 -0700)]
Merge "Use the effective peer MTU when preparing the codec configuration" am: 35b08f5708
am: b578b37882

Change-Id: I080f3bad3e6e5e4731e95ec87dee80a5149d75cf

6 years agoMerge "Use the effective peer MTU when preparing the codec configuration"
Pavlin Radoslavov [Tue, 22 May 2018 17:40:06 +0000 (10:40 -0700)]
Merge "Use the effective peer MTU when preparing the codec configuration"
am: 35b08f5708

Change-Id: Id2a86ff485aa61c60bd61ea55c296164983fe159

6 years agoMerge "Don't mix internal AVDTP state when connecting to two devices" am: d0eff6ef6c
Pavlin Radoslavov [Tue, 22 May 2018 17:36:12 +0000 (10:36 -0700)]
Merge "Don't mix internal AVDTP state when connecting to two devices" am: d0eff6ef6c
am: 89d81544de

Change-Id: I1f505d46c5a138cd0c89e63669c00fe20637a2fb

6 years agoMerge "Use the effective peer MTU when preparing the codec configuration"
Treehugger Robot [Tue, 22 May 2018 17:32:18 +0000 (17:32 +0000)]
Merge "Use the effective peer MTU when preparing the codec configuration"

6 years agoMerge "Don't mix internal AVDTP state when connecting to two devices"
Pavlin Radoslavov [Tue, 22 May 2018 17:30:46 +0000 (10:30 -0700)]
Merge "Don't mix internal AVDTP state when connecting to two devices"
am: d0eff6ef6c

Change-Id: I2d538de9b73bdcb12800cc30eb38c848f384dc83

6 years agoMerge "Don't mix internal AVDTP state when connecting to two devices"
Treehugger Robot [Tue, 22 May 2018 17:25:31 +0000 (17:25 +0000)]
Merge "Don't mix internal AVDTP state when connecting to two devices"

6 years agoMerge "gatt_api: Avoid possible NULL dereference" am: bea526992d
Greg Kaiser [Tue, 22 May 2018 16:42:31 +0000 (09:42 -0700)]
Merge "gatt_api: Avoid possible NULL dereference" am: bea526992d
am: ac64837245

Change-Id: I3b84a95ff4f5f6b110856c35c4e3ea658672011a

6 years agoMerge "gatt_api: Avoid possible NULL dereference"
Greg Kaiser [Tue, 22 May 2018 16:38:13 +0000 (09:38 -0700)]
Merge "gatt_api: Avoid possible NULL dereference"
am: bea526992d

Change-Id: Ic37eb3f50d9458b162e12a38a9d9164119f71c69

6 years agoMerge "gatt_api: Avoid possible NULL dereference"
Treehugger Robot [Tue, 22 May 2018 16:28:29 +0000 (16:28 +0000)]
Merge "gatt_api: Avoid possible NULL dereference"

6 years agoUse the effective peer MTU when preparing the codec configuration
Pavlin Radoslavov [Tue, 22 May 2018 09:03:20 +0000 (02:03 -0700)]
Use the effective peer MTU when preparing the codec configuration

Added new method A2dpCodecConfig::getEffectiveMtu() and use it
to obtain the effective MTU per peer per codec.
The effective peer MTU could be smaller than the one reported
by the peer (e.g., for interoperability reasons).

Bug: 77913350
Test: Manual
Change-Id: Idd5230681ac5856fd18dd33ac48723c6ea609e16

6 years agoGATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID am: 37fdb267db
Hemant Gupta [Tue, 22 May 2018 15:58:08 +0000 (08:58 -0700)]
GATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID am: 37fdb267db
am: 92237a264c

Change-Id: I4616a28500041b306814c49da49ae85066cb2694

6 years agoGATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID
Hemant Gupta [Tue, 22 May 2018 15:52:15 +0000 (08:52 -0700)]
GATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID
am: 37fdb267db

Change-Id: I7f2ac1a2f2af399cb61d878f95c99c3bf5684590

6 years agogatt_api: Avoid possible NULL dereference
Greg Kaiser [Tue, 22 May 2018 13:59:48 +0000 (06:59 -0700)]
gatt_api: Avoid possible NULL dereference

We move a logging statement which dereferences a NULL pointer
until after the NULL check, and expand the error message for
the NULL check to include the function name.

Test: TreeHugger
Change-Id: Ib5134b0d6b9ec5da95ee62da9412b977925000ee

6 years agoDon't mix internal AVDTP state when connecting to two devices
Pavlin Radoslavov [Fri, 18 May 2018 03:38:44 +0000 (20:38 -0700)]
Don't mix internal AVDTP state when connecting to two devices

There is a race condition when connecting to two devices, and
the connection to one of the devices is not powered on.

Because of the race condition, the wrong tBTA_AV_LCB entry inside
bta_av_sig_chg() might be allocated for the connection to
the device that is powered on. As a result of that, when
the connection attempt to the powered off device times out,
we will use the wrong bta_handle to close the existing AVDTP connection to
the device that is connected.

Also:
 - Add a new function BTA_AvObtainPeerChannelIndex() to select the
   appropriate AvdtpCcb entry if there an outgoing connection request
   while an incoming connection is received.
 - Added/updated log messages to help debugging similar issues in the future
 - Removed unnecessary SetActivePeer() call inside the BtifAv state
   machine for A2DP Source to avoid additional internal/transient glitches

Test: Manual
Bug: 79697137
Change-Id: Ie55e3dcf6c6a15637ce3631f2828548a2423d881

6 years agoGATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID
Hemant Gupta [Tue, 22 May 2018 03:55:50 +0000 (09:25 +0530)]
GATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID

Fix improper usage of 16 and 32 bit UUID's in Disocever services by UUID
Fixes PTS test cases GATT/CL/GAD/BV-08-C and GATT/CL/GAR/BV-03-C.

Test: PTS test cases GATT/CL/GAD/BV-08-C and GATT/CL/GAR/BV-03-C passes

Bug: 80095184
Change-Id: Ia0a26bd20ee68c5c7db0bc00036634f6719f25e9

6 years agoSimplify bta_gattc_sdp_callback am: cabb39c432
Jakub Pawlowski [Tue, 22 May 2018 00:30:12 +0000 (17:30 -0700)]
Simplify bta_gattc_sdp_callback am: cabb39c432
am: 0f1b7d0cd8

Change-Id: I1f4ef1a49c53ff059a1ba2fd7e194534788d0400

6 years agoSimplify bta_gattc_sdp_callback
Jakub Pawlowski [Tue, 22 May 2018 00:24:09 +0000 (17:24 -0700)]
Simplify bta_gattc_sdp_callback
am: cabb39c432

Change-Id: I22016fd73cb6b01bb56aa82c712c8c1dbdcdc09f

6 years agoMerge "HFP: Return SDP status to HFP layer" am: 0522a227b3
Jack He [Mon, 21 May 2018 22:37:31 +0000 (15:37 -0700)]
Merge "HFP: Return SDP status to HFP layer" am: 0522a227b3
am: 5dcccc86e6

Change-Id: I057c9f5d45fca858d93ea380ae4b2d87d18c70e2

6 years agoUnify logging in gatt_api.cc am: 431cf613c4
Jakub Pawlowski [Mon, 21 May 2018 22:36:06 +0000 (15:36 -0700)]
Unify logging in gatt_api.cc am: 431cf613c4
am: 0a6b361ef8

Change-Id: Id258ef3abd5cfadabc96c297c5079fa805506ad9

6 years agoSimplify bta_gattc_sdp_callback
Jakub Pawlowski [Fri, 18 May 2018 22:57:01 +0000 (15:57 -0700)]
Simplify bta_gattc_sdp_callback

* join multiple if statements to improve readability
* malloc and free memory just once for tBTA_GATTC_CB_DATA

Test: compilation
Change-Id: I907645ed04ed4b628a3b24785b1ccd16b69d83bb

6 years agoHFP: Return SDP status to HFP layer
Jack He [Mon, 21 May 2018 22:03:59 +0000 (15:03 -0700)]
HFP: Return SDP status to HFP layer
am: 90174f3514

Change-Id: I38ab45b2f5697977ca3d6a6d9e53a4ee24935e76

6 years agoMerge "HFP: Return SDP status to HFP layer"
Jack He [Mon, 21 May 2018 21:54:56 +0000 (14:54 -0700)]
Merge "HFP: Return SDP status to HFP layer"
am: 0522a227b3

Change-Id: I50e4a44b66ef727bd8243fc2182a2ddb36bbfbb1

6 years agoUnify logging in gatt_api.cc
Jakub Pawlowski [Mon, 21 May 2018 21:45:31 +0000 (14:45 -0700)]
Unify logging in gatt_api.cc
am: 431cf613c4

Change-Id: Ia4fa67a5c03c9c8b478550ff89534005d13a9165

6 years agoMerge "HFP: Return SDP status to HFP layer"
Treehugger Robot [Mon, 21 May 2018 21:20:07 +0000 (21:20 +0000)]
Merge "HFP: Return SDP status to HFP layer"

6 years agoUnify logging in gatt_api.cc
Jakub Pawlowski [Mon, 21 May 2018 16:38:48 +0000 (09:38 -0700)]
Unify logging in gatt_api.cc

- always log conn_id as hex value
- use "=" instead of ":" as delimiter between name and value
- get rid of StringPrintf

Test: compilation
Change-Id: Ia35b79c3732b19661e4655d5cf0923b7e701985f

6 years agoHFP: Return SDP status to HFP layer
Jack He [Sun, 20 May 2018 03:05:02 +0000 (20:05 -0700)]
HFP: Return SDP status to HFP layer

* Fix an error introduced in change Ic0b4498dd623d0ea31b4513d6b7861cae390bc72
  so that SDP status is sent up to the HFP BTA layer
* With SDP status correctly passed up, HFP BTA layer can correctly
  determine when to continue SDP search for HSP
* When open connection to HFP or HSP devices, use a control block's
  registered services instead of passing in opening services every time
  from BTIF layer
* Do not use a control block that are in CONNECTING or DISCONNECTING
  state
* Add a crash in btif_hf.cc:connect_int() to gurantee that no control
  block is in connecting or disconnecting state when connect_int is
  called as it should be guranteed by the btif queue configuration

Bug: 74234576
Test: connect to headset, make calls and hangup
Change-Id: I5e2bce8c2f0f51bd3fd3e85e82827c5fb5e92887
(cherry picked from commit 4bf260f2b71c15f091290b16f6c7948b21fa7c49)

6 years agoHFP: Return SDP status to HFP layer
Jack He [Sun, 20 May 2018 03:05:02 +0000 (20:05 -0700)]
HFP: Return SDP status to HFP layer

* Fix an error introduced in change Ic0b4498dd623d0ea31b4513d6b7861cae390bc72
  so that SDP status is sent up to the HFP BTA layer
* With SDP status correctly passed up, HFP BTA layer can correctly
  determine when to continue SDP search for HSP
* When open connection to HFP or HSP devices, use a control block's
  registered services instead of passing in opening services every time
  from BTIF layer
* Do not use a control block that are in CONNECTING or DISCONNECTING
  state
* Add a crash in btif_hf.cc:connect_int() to gurantee that no control
  block is in connecting or disconnecting state when connect_int is
  called as it should be guranteed by the btif queue configuration

Bug: 74234576
Test: connect to headset, make calls and hangup
Change-Id: I5e2bce8c2f0f51bd3fd3e85e82827c5fb5e92887

6 years agoMerge "AVRCP: Route CType NOT_IMPLEMENTED as a response" into pi-dev
Myles Watson [Sat, 19 May 2018 00:26:41 +0000 (17:26 -0700)]
Merge "AVRCP: Route CType NOT_IMPLEMENTED as a response" into pi-dev
am: 436f56f20c

Change-Id: I759f0640c662c18427c77ff211ddd5ae11b221ab

6 years agoMerge "AVRCP: Route CType NOT_IMPLEMENTED as a response" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 00:08:21 +0000 (00:08 +0000)]
Merge "AVRCP: Route CType NOT_IMPLEMENTED as a response" into pi-dev

6 years agoAVRCP: Route CType NOT_IMPLEMENTED as a response am: f74cecf93e
Myles Watson [Fri, 18 May 2018 21:15:10 +0000 (14:15 -0700)]
AVRCP: Route CType NOT_IMPLEMENTED as a response am: f74cecf93e
am: 6a5e210804

Change-Id: If966673e261a623f9b397e813ab44eec3e59b37b

6 years agoAVRCP: Route CType NOT_IMPLEMENTED as a response
Myles Watson [Fri, 18 May 2018 21:12:06 +0000 (14:12 -0700)]
AVRCP: Route CType NOT_IMPLEMENTED as a response
am: f74cecf93e

Change-Id: I1e9c0c55cc7f510f04c6a6add316248c6ae6ca52

6 years agoAVRCP: Route CType NOT_IMPLEMENTED as a response
Myles Watson [Fri, 18 May 2018 18:31:33 +0000 (11:31 -0700)]
AVRCP: Route CType NOT_IMPLEMENTED as a response

Fixes: 79698590
Test: net_test_avrcp, Connect to the Anker MP140
Change-Id: Ie88dcea949ecb33bc3d76d86b07ab0396a21500d
(cherry picked from commit f74cecf93e648e861363aa312bef08327f19a26a)

6 years agoAVRCP: Route CType NOT_IMPLEMENTED as a response
Myles Watson [Fri, 18 May 2018 18:31:33 +0000 (11:31 -0700)]
AVRCP: Route CType NOT_IMPLEMENTED as a response

Bug: 79698590
Test: net_test_avrcp, Connect to the Anker MP140
Change-Id: Ie88dcea949ecb33bc3d76d86b07ab0396a21500d

6 years agoAdd General Reject for invalid PDU ID am: 7570175750
tedwang [Thu, 17 May 2018 18:42:10 +0000 (11:42 -0700)]
Add General Reject for invalid PDU ID am: 7570175750
am: e259e19c82

Change-Id: Id9f5d8cb142c01915c198c4eae6db687cbc985f4

6 years agoAdd General Reject for invalid PDU ID
tedwang [Thu, 17 May 2018 18:38:35 +0000 (11:38 -0700)]
Add General Reject for invalid PDU ID
am: 7570175750

Change-Id: I47d646e48c002a241806f49d058f1674e8b1e2a6

6 years agoMerge "Respond reject with INVALID_PARAMETER when register for invalid event ID"...
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

6 years agoMerge "Add General Reject for invalid PDU ID" into pi-dev
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

6 years agoMerge "AVRCP: Verify SetBrowsedPlayer player ID" into pi-dev
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

6 years agoMerge "AVRCP: Respond UID Changed for invalid Get Item Attributes command" into pi-dev
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

6 years agoMerge "Respond reject with INVALID_PARAMETER when register for invalid event ID"...
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

6 years agoMerge "Add General Reject for invalid PDU 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

6 years agoMerge "AVRCP: Verify SetBrowsedPlayer player 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

6 years agoMerge "AVRCP: Respond UID Changed for invalid Get Item Attributes command" into pi-dev
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

6 years ago[automerger skipped] Don't update the MTU across multiple A2DP connections that are...
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

6 years agoAdd General Reject for invalid PDU ID
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
(cherry picked from commit 3fbf8b4fff8b52b781fa611e0b62c97bca28d76f)

6 years agoDon't update the MTU across multiple A2DP connections that are open
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)

6 years agoDon't update the MTU across multiple A2DP connections that are open am: 1200c75df8
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

6 years agoDon't update the MTU across multiple A2DP connections that are open
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

6 years agoAdd General Reject for invalid PDU ID
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

6 years agoDon't update the MTU across multiple A2DP connections that are open
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

6 years ago[automerger skipped] Merge "Print extra error code if LDAC encoder fails to initializ...
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

6 years agoMerge "Print extra error code if LDAC encoder fails to initialize" into pi-dev
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

6 years agoHID: Update state to disconnected in virtual unplug
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

6 years agoMerge "Respond reject with INVALID_PARAMETER when register for invalid event ID"...
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

6 years agoMerge "Respond reject with INVALID_PARAMETER when register for invalid event ID"
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

6 years agoMerge "Print extra error code if LDAC encoder fails to initialize" am: 3a537a3e07
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

6 years agoMerge "Respond reject with INVALID_PARAMETER when register for invalid event ID"
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"

6 years agoMerge "Print extra error code if LDAC encoder fails to initialize"
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

6 years agoPrint extra error code if LDAC encoder fails to initialize
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)

6 years agoMerge "Print extra error code if LDAC encoder fails to initialize"
Treehugger Robot [Tue, 15 May 2018 23:21:27 +0000 (23:21 +0000)]
Merge "Print extra error code if LDAC encoder fails to initialize"

6 years agoRespond reject with INVALID_PARAMETER when register for invalid event ID
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)

6 years agoRespond reject with INVALID_PARAMETER when register for invalid event ID
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

6 years agoAVRCP: Respond UID Changed for invalid Get Item Attributes command am: 335d6e62b0
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

6 years agoAdd respond Reject with Invalid parameter for Unknown Capability ID am: bf514e3954
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

6 years agoAVRCP: Respond UID Changed for invalid Get Item Attributes command
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

6 years agoAdd respond Reject with Invalid parameter for Unknown Capability ID
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

6 years agoMerge "AVRCP: Verify SetBrowsedPlayer player ID" am: 3103d311f4
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

6 years agoAVRCP: Respond UID Changed for invalid Get Item Attributes command
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)

6 years agoAVRCP: Respond UID Changed for invalid Get Item Attributes command
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

6 years agoMerge "AVRCP: Verify SetBrowsedPlayer player ID"
Hansong Zhang [Tue, 15 May 2018 20:29:28 +0000 (13:29 -0700)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID"
am: 3103d311f4

Change-Id: I1bb359ff06ed6414ccc0c6440a2b9000caba871b

6 years agoHID: Update state to disconnected in virtual unplug
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)

6 years agoUse identity addr in BLE scan filter
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

6 years agoAdd respond Reject with Invalid parameter for Unknown Capability ID
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)

6 years agoAVRCP: 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
(cherry picked from commit f54a72cd8dcfae62ccab5d0b03b50539dde5c520)

6 years agoMerge "AVRCP: Verify SetBrowsedPlayer player ID"
Treehugger Robot [Tue, 15 May 2018 20:13:30 +0000 (20:13 +0000)]
Merge "AVRCP: Verify SetBrowsedPlayer player ID"

6 years agoAVRCP: 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

6 years agoPrint extra error code if LDAC encoder fails to initialize
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

6 years agoMerge "Removed alarm callback execution statistics" am: 2190a20ef6
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

6 years agoMerge "Removed alarm callback execution statistics"
Jakub Pawlowski [Tue, 15 May 2018 02:12:37 +0000 (19:12 -0700)]
Merge "Removed alarm callback execution statistics"
am: 2190a20ef6

Change-Id: I12606fc5282b3c1c76d0942240f87f7a2eeec96f

6 years agoMerge "Removed alarm callback execution statistics"
Jakub Pawlowski [Tue, 15 May 2018 02:00:07 +0000 (02:00 +0000)]
Merge "Removed alarm callback execution statistics"

6 years agoMerge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE" am: ff38a2925a
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

6 years agoMerge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE"
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

6 years agoMerge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE"
Treehugger Robot [Mon, 14 May 2018 23:28:45 +0000 (23:28 +0000)]
Merge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE"

6 years agoMask "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

6 years agoRemoved alarm callback execution statistics
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

6 years agoMerge "Use identity addr in BLE scan filter" am: e8a0bfd2ba
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

6 years agoUse identity addr in BLE scan filter
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)

6 years agoMerge "Use identity addr in BLE scan filter"
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

6 years agoMerge "Use identity addr in BLE scan filter"
Jakub Pawlowski [Mon, 14 May 2018 20:47:52 +0000 (20:47 +0000)]
Merge "Use identity addr in BLE scan filter"

6 years agoMerge "Check number of attributes before writing to a buffer" into pi-dev
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

6 years agoMerge "Add respond Reject with Invalid parameter for Unknown Capability ID" into...
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

6 years agoMerge "Check number of attributes before writing to a buffer" into pi-dev
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

6 years agoMerge "Add respond Reject with Invalid parameter for Unknown Capability ID" into...
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

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into oc-dev am...
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

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into oc-dev am...
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

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into oc-dev am...
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

6 years agoMerge "Use weak pointers for device.cc callbacks to prevent use after delete" am...
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

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into oc-dev
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

6 years agoMerge "Use weak pointers for device.cc callbacks to prevent use after delete"
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

6 years agoMerge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev...
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