OSDN Git Service
Subramanian Srinivasan [Thu, 24 May 2018 23:28:32 +0000 (16:28 -0700)]
Merge "GATT: Fix GATT error response for execute write" into pi-dev
am:
576631d792
Change-Id: Id4190fdb64435cadb234d272919f53472e3c2081
Kim Low [Thu, 24 May 2018 23:19:33 +0000 (16:19 -0700)]
Merge "Add separate sniff mode settings for gamepads" am:
c372f42e22
am:
3dd82fc86c
Change-Id: I5c7420db39120835e734b2daf282f04ab5db8614
Kim Low [Thu, 24 May 2018 23:19:23 +0000 (16:19 -0700)]
Merge changes from topic "ds4-support" am:
4fa06fe06d
am:
25447adb6e
Change-Id: Ic9a213e9eda0cb37b23d0cf890169382d9b1acb4
Sunny Kapdi [Thu, 24 May 2018 23:10:30 +0000 (16:10 -0700)]
A2DP Offload: Don't crash on repeated endSession am:
7a2110d666
am:
bb8d5e287c
Change-Id: I06b2e8b847abc4c5b6d179752603e9e0a9ec2001
Subramanian Srinivasan [Thu, 24 May 2018 23:09:52 +0000 (16:09 -0700)]
Merge "GATT: Fix GATT error response for execute write" am:
89f92dbdc4
am:
cfe66c38bc
Change-Id: I7ebd2fd05692dbb7994c84bdd5c2a7d58a80903b
Stanley Tng [Thu, 24 May 2018 23:08:48 +0000 (16:08 -0700)]
Merge "Increase LE connection interval with bonded Hearing Aids" am:
7dea19a6cc
am:
b39f829886
Change-Id: Ie4dcf00ac4a3d799289d6ae68a919529b0388f29
Kim Low [Thu, 24 May 2018 23:07:06 +0000 (16:07 -0700)]
Merge "Add separate sniff mode settings for gamepads"
am:
c372f42e22
Change-Id: Ibaff9b731e224c20b7f5336c74d02570904cf00e
Kim Low [Thu, 24 May 2018 23:06:57 +0000 (16:06 -0700)]
Merge changes from topic "ds4-support"
am:
4fa06fe06d
Change-Id: I813d0763520ccaac02e900e5ff1cf5b48a87ff19
Android Build Merger (Role) [Thu, 24 May 2018 23:01:52 +0000 (23:01 +0000)]
Merge "[automerger skipped] Merge "Enable the AVRCP Service by default (2/2)" am:
1a4403bdc8 am:
18b8ad39a9 -s ours" into pi-dev-plus-aosp
Ajay Panicker [Thu, 24 May 2018 23:01:40 +0000 (16:01 -0700)]
[automerger skipped] Merge "Enable the AVRCP Service by default (2/2)" am:
1a4403bdc8
am:
18b8ad39a9 -s ours
Change-Id: I88afc7328b599c79933e937f70792749b7054569
Ajay Panicker [Thu, 24 May 2018 23:01:22 +0000 (16:01 -0700)]
Merge "AVRCP: Narrow the scope of the lock in Init and Cleanup" into pi-dev
am:
a5e59584df
Change-Id: Id58707332d8aeea7d4806a3efc3eeff3e45f941e
Jakub Pawlowski [Thu, 24 May 2018 23:00:01 +0000 (16:00 -0700)]
Add PDU size checks in process_service_search_attr_rsp
am:
49399b5243
Change-Id: I3fd72aa398a35456e9062db1b9e448a29951cbc0
Stanley Tng [Thu, 24 May 2018 22:53:11 +0000 (15:53 -0700)]
Merge "Increase LE connection interval with bonded Hearing Aids" into pi-dev
am:
daa0656702
Change-Id: I8e8f7888de41ebbd49958da31ccd5b903d684738
Treehugger Robot [Thu, 24 May 2018 22:52:05 +0000 (22:52 +0000)]
Merge "Add separate sniff mode settings for gamepads"
Treehugger Robot [Thu, 24 May 2018 22:52:05 +0000 (22:52 +0000)]
Merge changes from topic "ds4-support"
* changes:
Add UHID GET_REPORT functionality
Option to send data report through BTA_HhSetReport
Sunny Kapdi [Thu, 24 May 2018 22:49:28 +0000 (15:49 -0700)]
A2DP Offload: Don't crash on repeated endSession
am:
7a2110d666
Change-Id: I8cdd3690128e6bb4652beedfe4e84440a5b8dc33
Kim Low [Wed, 20 Dec 2017 23:11:08 +0000 (15:11 -0800)]
Add separate sniff mode settings for gamepads
For gamepads, the sniff intervals need to be much shorter. The
min is set to 14 slots (8.75ms) and max is set to 18 slots
(11.25ms).
Test: Load >=4.10 hid-sony driver, connect a DualShock4, check its
responsiveness.
Wait for 5 minutes, wake it up (if it went into PARK mode)
and check that it's still as responsive.
Furthermore, use a Bluetooth sniffer to confirm the sniff
interval.
Bug:
38511270
Change-Id: I27e2e0c8e88ab51800c4976e0971c92a3793f8d2
Kim Low [Thu, 6 Apr 2017 20:16:26 +0000 (13:16 -0700)]
Add UHID GET_REPORT functionality
GET_REPORT wasn't supported previously. >=4.10 hid-sony driver
requires this feature to get the calibration data for DualShock4.
To be backwards compatible with kernel 3.10, UHID_FEATURE and
UHID_FEATURE_ANSWER are used instead of UHID_GET_REPORT and
UHID_GET_REPORT_REPLY. Also, UHID_SET_REPORT functionality cannot
be supported since it's not implemented in kernel 3.10.
Test: Load >=4.10 hid-sony driver, connect a DualShock4, and check
that the DualShock4 LED turns blue, which confirms both
get feature report and output data report working.
Bug:
38511270
Change-Id: Ic28760f423cc09754fd32a107a499be6677ca747
Kim Low [Thu, 6 Apr 2017 19:33:14 +0000 (12:33 -0700)]
Option to send data report through BTA_HhSetReport
Drivers may send SET_FEATURE_REPORT by using type UHID_OUTPUT
and output.rtype UHID_FEATURE_REPORT, or send OUTPUT_DATA_REPORT
by using type UHID_OUTPUT and output.rtype UHID_OUTPUT_REPORT.
For type UHID_OUTPUT, the Fluoride stack calls btif_hh_setreport()
which then calls BTA_HhSetReport() correspondingly. Hence it is
necessary for BTA_HhSetReport() to handle both the output.type
UHID_FEATURE_REPORT (BTA_HH_RPTT_FEATURE) and UHID_DATA_REPORT
(BTA_HH_RPTT_OUTPUT).
Test: No stand-alone test.
Bug:
38511270
Change-Id: I210f6338d3152dad100920dc8a1eb69b563b70ae
TreeHugger Robot [Thu, 24 May 2018 20:25:22 +0000 (20:25 +0000)]
Merge "GATT: Fix GATT error response for execute write" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 20:00:58 +0000 (20:00 +0000)]
Merge "AVRCP: Narrow the scope of the lock in Init and Cleanup" into pi-dev
Ajay Panicker [Thu, 24 May 2018 18:26:15 +0000 (11:26 -0700)]
AVRCP: Narrow the scope of the lock in Init and Cleanup
Bug:
80227904
Test: Disable Bluetooth while connected to a device
Change-Id: I6c77e38ebaa84e4a075ef4636d6b519d4ccfb8c5
Subramanian Srinivasan [Thu, 24 May 2018 19:07:14 +0000 (12:07 -0700)]
Merge "GATT: Fix GATT error response for execute write"
am:
89f92dbdc4
Change-Id: Ic2df885dd38a709846d0c1f113063647ce915a28
Stanley Tng [Thu, 24 May 2018 19:05:29 +0000 (12:05 -0700)]
Merge "Increase LE connection interval with bonded Hearing Aids"
am:
7dea19a6cc
Change-Id: Icb735302b529311ef991800315866d0cac4ddbd6
Ajay Panicker [Thu, 24 May 2018 18:02:34 +0000 (11:02 -0700)]
Merge "Enable the AVRCP Service by default (2/2)"
am:
1a4403bdc8
Change-Id: If4215abdd6b8b8e676d7d89b39ad0fe71b8148d0
Sunny Kapdi [Wed, 23 May 2018 22:14:35 +0000 (15:14 -0700)]
A2DP Offload: Don't crash on repeated endSession
AudioOffload endSession is called from multiple places.
Do not crash if session has already ended.
Also, added/enabled extra log messages to help debug similar issues.
Bug:
80148693
Test: Manual
Change-Id: I409c0146f9629cee6bdabf16e52e88201ee02267
Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]
Add PDU size checks in process_service_search_attr_rsp
Bug:
79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Subramanian Srinivasan [Wed, 23 May 2018 02:35:48 +0000 (19:35 -0700)]
GATT: Fix GATT error response for execute write
Usecaes:
Execute GATT/SR/GAW/BI-09C
Expected Result:
Test case passes
Observed Result:
Unable to pass the test cases
Root Cause:
Incorrect error response sent by DUT if there is no pending write request
Fix:
Send GATT_INVALID_OFFSET error when no pending write request
Test: GATT/SR/GAW/BI-09C passes
Bug:
80168519
Change-Id: I74e723ab0e39ce04e21f929a16dffcd996d1d23e
(cherry picked from commit
b8a5b213a63def7c0a0d09d322603ae5a9abd435)
Treehugger Robot [Thu, 24 May 2018 03:37:54 +0000 (03:37 +0000)]
Merge "GATT: Fix GATT error response for execute write"
Jakub Pawlowski [Thu, 24 May 2018 02:00:37 +0000 (19:00 -0700)]
Merge "GATT: Handle too short Error Response PDU" into pi-dev
am:
ccf208e4fc
Change-Id: I5bf41f4a05a418701ab16afec7559eb98253242b
Jack He [Thu, 24 May 2018 01:39:35 +0000 (18:39 -0700)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange" into pi-dev
am:
b90857655b
Change-Id: I4c4ef367a80821bc9a650179db20dfe8535c9d14
Andre Eisenbach [Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)]
Merge "AVRCP: Cancel all pending messages and prevent future messages after cleanup" into pi-dev
am:
389fdbdab4
Change-Id: Iffd20f61a8ba8a6c8e81a0aa41e2b8e6c865e98f
TreeHugger Robot [Thu, 24 May 2018 00:23:02 +0000 (00:23 +0000)]
Merge "Increase LE connection interval with bonded Hearing Aids" into pi-dev
Treehugger Robot [Wed, 23 May 2018 23:59:08 +0000 (23:59 +0000)]
Merge "Increase LE connection interval with bonded Hearing Aids"
Treehugger Robot [Wed, 23 May 2018 23:52:58 +0000 (23:52 +0000)]
Merge "Enable the AVRCP Service by default (2/2)"
Ajay Panicker [Wed, 11 Apr 2018 18:16:26 +0000 (11:16 -0700)]
Enable the AVRCP Service by default (2/2)
Bug:
80188446
Test: Flash a device and see that AvrcpTargetService is enabled
Change-Id: I1ad1fff07b5ee6c553fc89a75e649789d82f85cc
Merged-In: I1ad1fff07b5ee6c553fc89a75e649789d82f85cc
Jack He [Wed, 23 May 2018 22:48:23 +0000 (15:48 -0700)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange" am:
78eed90d9a
am:
f48b7b15d8
Change-Id: I5250ad35e7950fd97de9e804e6e22fbbc38bc3e4
Pavlin Radoslavov [Wed, 23 May 2018 22:48:01 +0000 (15:48 -0700)]
Reduce A2DP/AVDTP related dumpsys output am:
8757bc7ab0
am:
4ad5addcdc
Change-Id: Ib13336a3db275d571a674d3fb5013bc34e6b7bfd
Pavlin Radoslavov [Wed, 23 May 2018 22:47:13 +0000 (15:47 -0700)]
Explicitly stop the stream when the A2DP session ends am:
6d493bdc7b
am:
89a63dd115
Change-Id: I48de15552c48c83e2af9e42ae506268659214c61
Stanley Tng [Wed, 23 May 2018 01:15:42 +0000 (18:15 -0700)]
Increase LE connection interval with bonded Hearing Aids
When there are bonded Hearing Aids device, increase the minimum LE
Connection Interval to reduce the audio noises on the devices.
Bug:
80079923
Test: Manual test with RAT mouse and HA devices
Change-Id: I589bc574ef7ff3754a149e30fb3c0a685ce27823
(cherry picked from commit
111c7db93f613a09022d44639517a94be04ab300)
Stanley Tng [Wed, 23 May 2018 01:15:42 +0000 (18:15 -0700)]
Increase LE connection interval with bonded Hearing Aids
When there are bonded Hearing Aids device, increase the minimum LE
Connection Interval to reduce the audio noises on the devices.
Bug:
80079923
Test: Manual test with RAT mouse and HA devices
Change-Id: I589bc574ef7ff3754a149e30fb3c0a685ce27823
Pavlin Radoslavov [Wed, 23 May 2018 21:27:22 +0000 (14:27 -0700)]
Merge "Explicitly stop the stream when the A2DP session ends" into pi-dev
am:
28984bf496
Change-Id: Id68539d3f3ab6de2a524d4b4a04191309426216b
Jack He [Wed, 23 May 2018 21:14:13 +0000 (14:14 -0700)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange"
am:
78eed90d9a
Change-Id: I87e695bef50566f766476ea2a6a46fe332ba1958
Treehugger Robot [Wed, 23 May 2018 20:46:44 +0000 (20:46 +0000)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange"
Pavlin Radoslavov [Wed, 23 May 2018 20:09:58 +0000 (13:09 -0700)]
Reduce A2DP/AVDTP related dumpsys output
am:
8757bc7ab0
Change-Id: I2ef1439c45aa1d7a0504cc3f5529a9e596e3e6c3
TreeHugger Robot [Wed, 23 May 2018 18:55:56 +0000 (18:55 +0000)]
Merge "GATT: Handle too short Error Response PDU" into pi-dev
Jack He [Wed, 23 May 2018 00:35:57 +0000 (17:35 -0700)]
HFP: Ignore DISCONNECTED state in PhoneStateChange
* DISCONNECTED state is a transient state from Telecom service and will
always lead to IDLE state when the call is completely disconnected
* This state should be ignored as HFP specification does not handle
cases when a call is being disconnected
Bug:
78674822
Test: Receive incoming call and hangup
Change-Id: Icebdf9b5fdffad3e2b78645d4f0c69ec13b2604c
TreeHugger Robot [Wed, 23 May 2018 18:30:09 +0000 (18:30 +0000)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange" into pi-dev
Pavlin Radoslavov [Wed, 23 May 2018 18:10:02 +0000 (11:10 -0700)]
Explicitly stop the stream when the A2DP session ends
am:
6d493bdc7b
Change-Id: I63ccc644c7f34b62f2d95000e74b9f0a8ea6c465
Jakub Pawlowski [Wed, 23 May 2018 17:19:53 +0000 (10:19 -0700)]
GATT: Handle too short Error Response PDU
Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.
Bug:
79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Andre Eisenbach [Wed, 23 May 2018 16:55:46 +0000 (16:55 +0000)]
Merge "AVRCP: Cancel all pending messages and prevent future messages after cleanup" into pi-dev
Pavlin Radoslavov [Wed, 23 May 2018 14:40:09 +0000 (07:40 -0700)]
Reduce A2DP/AVDTP related dumpsys output
* Don't print control blocks that are not in use
* Print some sections only if the runtime trace level is DEBUG(=5) or above
* Renamed section "A2DP Codecs and Peers State:" to
"A2DP Peers State:"
Bug:
80179152
Test: Manual
Change-Id: I9fcd7387ed469094132d5be989d4976ce103cfc8
Subramanian Srinivasan [Wed, 23 May 2018 02:35:48 +0000 (19:35 -0700)]
GATT: Fix GATT error response for execute write
Usecaes:
Execute GATT/SR/GAW/BI-09C
Expected Result:
Test case passes
Observed Result:
Unable to pass the test cases
Root Cause:
Incorrect error response sent by DUT if there is no pending write request
Fix:
Send GATT_INVALID_OFFSET error when no pending write request
Test: GATT/SR/GAW/BI-09C passes
Bug:
80168519
Change-Id: I74e723ab0e39ce04e21f929a16dffcd996d1d23e
Jack He [Wed, 23 May 2018 00:35:57 +0000 (17:35 -0700)]
HFP: Ignore DISCONNECTED state in PhoneStateChange
* DISCONNECTED state is a transient state from Telecom service and will
always lead to IDLE state when the call is completely disconnected
* This state should be ignored as HFP specification does not handle
cases when a call is being disconnected
Bug:
78674822
Test: Receive incoming call and hangup
Change-Id: Icebdf9b5fdffad3e2b78645d4f0c69ec13b2604c
(cherry picked from commit
f720c9af076347a4ae2cf2fb4c4ed5b79fdb0049)
TreeHugger Robot [Wed, 23 May 2018 02:34:57 +0000 (02:34 +0000)]
Merge "Explicitly stop the stream when the A2DP session ends" into pi-dev
Pavlin Radoslavov [Wed, 23 May 2018 00:56:22 +0000 (17:56 -0700)]
Explicitly stop the stream when the A2DP session ends
Note: this needs to be done only for the A2DP HW offload scenario.
For the software data path, this will be done by the Audio HAL.
Bug:
80117050
Test: Manual
Change-Id: I4397d219d82d779706e946f0c7f833c1e93e91f4
Merged-In: I4397d219d82d779706e946f0c7f833c1e93e91f4
(cherry picked from commit
6d493bdc7b7cc9d38f6759d08734cce691c6ac45)
Pavlin Radoslavov [Wed, 23 May 2018 00:56:22 +0000 (17:56 -0700)]
Explicitly stop the stream when the A2DP session ends
Note: this needs to be done only for the A2DP HW offload scenario.
For the software data path, this will be done by the Audio HAL.
Bug:
80117050
Test: Manual
Change-Id: I4397d219d82d779706e946f0c7f833c1e93e91f4
Ajay Panicker [Tue, 22 May 2018 21:42:16 +0000 (14:42 -0700)]
AVRCP: Cancel all pending messages and prevent future messages after cleanup
Bug:
79859133
Test: Regression test and repeatedly turn Bluetooth off and on
Change-Id: I1aa05cc5430dbda1d4bae6aa9543f655baed77b4
Jakub Pawlowski [Tue, 22 May 2018 23:25:16 +0000 (16:25 -0700)]
Merge "Update connection parameters just once before GATT discovery" am:
55d4938b30
am:
1a51a24f09
Change-Id: I0e6f5305119a5be363a9eaf881bcbb1239bbae32
Jakub Pawlowski [Tue, 22 May 2018 23:19:32 +0000 (16:19 -0700)]
Merge "Update connection parameters just once before GATT discovery"
am:
55d4938b30
Change-Id: I85a8108d5171399a2dd94e7a880dc95b02d423a4
Treehugger Robot [Tue, 22 May 2018 23:01:26 +0000 (23:01 +0000)]
Merge "Update connection parameters just once before GATT discovery"
Jack He [Tue, 22 May 2018 22:47:28 +0000 (15:47 -0700)]
Merge "HFP: Set audio handle for active device during incoming call" into pi-dev
am:
bb25f6961b
Change-Id: I8539ed792cfbb3b48077ea62be51642258f04d79
TreeHugger Robot [Tue, 22 May 2018 22:41:10 +0000 (22:41 +0000)]
Merge "HFP: Set audio handle for active device during incoming call" into pi-dev
Joseph Pirozzo [Tue, 22 May 2018 22:35:08 +0000 (15:35 -0700)]
Merge "Support AVRCP Controller on JNI thread" am:
f323814822
am:
72ac53bf36
Change-Id: I71f2f9c6b6e8b3dd37cc961459893bc366a35ce5
Joseph Pirozzo [Tue, 22 May 2018 22:30:25 +0000 (15:30 -0700)]
Merge "Support AVRCP Controller on JNI thread"
am:
f323814822
Change-Id: I42d11c0145e32ec3f60829735040f5c30728b5b4
Joseph Pirozzo [Tue, 22 May 2018 22:20:02 +0000 (22:20 +0000)]
Merge "Support AVRCP Controller on JNI thread"
Joseph Pirozzo [Tue, 22 May 2018 21:57:49 +0000 (14:57 -0700)]
Merge "Support AVRCP Controller on JNI thread" into pi-dev
am:
6676b08fee
Change-Id: I9ae1b5052e76643c9b3f6cafed38a730ce9aea1a
Joseph Pirozzo [Tue, 22 May 2018 21:39:57 +0000 (21:39 +0000)]
Merge "Support AVRCP Controller on JNI thread" into pi-dev
Jakub Pawlowski [Tue, 22 May 2018 21:15:31 +0000 (14:15 -0700)]
Update connection parameters just once before GATT discovery
Call to L2CA_EnableUpdateBleConnParams is already made just before
call to bta_gattc_set_discover_st
Test: compilation
Change-Id: I30939065b5486e20c2f6f456dde96266e9395690
Jack He [Tue, 22 May 2018 00:09:29 +0000 (17:09 -0700)]
HFP: Set audio handle for active device during incoming call
* Set audio handle for active device during incoming call
* Change debug level logging to warning level when SCO is not allowed to
open or when RING command is not allowed to be sent
Bug:
77949569
Test: connect with HFP devices and receive incoming call
Change-Id: Ibc2caf740f94817ae725786e35e8592390167ce2
(cherry picked from commit
bad2898f07128b032e0bfa7a1b3e85fc832dfbef)
Pavlin Radoslavov [Tue, 22 May 2018 19:25:12 +0000 (12:25 -0700)]
[automerger skipped] Merge "Don't mix internal AVDTP state when connecting to two devices" into pi-dev
am:
e8b3b00dc5 -s ours
Change-Id: I19c861f39997c132576a35e4349331555ed285e0
TreeHugger Robot [Tue, 22 May 2018 19:17:40 +0000 (19:17 +0000)]
Merge "Don't mix internal AVDTP state when connecting to two devices" into pi-dev
Pavlin Radoslavov [Tue, 22 May 2018 19:14:07 +0000 (12:14 -0700)]
[automerger skipped] Merge "Use the effective peer MTU when preparing the codec configuration" into pi-dev
am:
0cb360b06f -s ours
Change-Id: I7e7f7f8addd1fb986bf5d60d0e6e1313cc6e2a4b
TreeHugger Robot [Tue, 22 May 2018 19:04:15 +0000 (19:04 +0000)]
Merge "Use the effective peer MTU when preparing the codec configuration" into pi-dev
Hemant Gupta [Tue, 22 May 2018 19:03:13 +0000 (12:03 -0700)]
GATT: Fix usage of 16 and 32 bit UUID's in Discover services by UUID
am:
a84a40afd3
Change-Id: Iaac3700166b006b3fcd6c259d36f52b3f605c9a1
Jack He [Tue, 22 May 2018 18:36:34 +0000 (11:36 -0700)]
Merge "HFP: Set audio handle for active device during incoming call" am:
9bef78a5b6
am:
1267c7e4d6
Change-Id: Ib78a0f309d12f489ff2f6d98e18dad485a300952
Jack He [Tue, 22 May 2018 18:31:23 +0000 (11:31 -0700)]
Merge "HFP: Set audio handle for active device during incoming call"
am:
9bef78a5b6
Change-Id: I5ee74df6c21914f1b03e045d60a1fa40e3cc1096
Treehugger Robot [Tue, 22 May 2018 18:17:38 +0000 (18:17 +0000)]
Merge "HFP: Set audio handle for active device during incoming call"
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
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
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
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
Merged-In: Idd5230681ac5856fd18dd33ac48723c6ea609e16
(cherry picked from commit
d57fcc86ed62f790e5fe1b0010b411016ea34f81)
Treehugger Robot [Tue, 22 May 2018 17:32:18 +0000 (17:32 +0000)]
Merge "Use the effective peer MTU when preparing the codec configuration"
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
Merged-In: Ie55e3dcf6c6a15637ce3631f2828548a2423d881
(cherry picked from commit
1e2cab39a42542f12862df1cd47bf6d90853138b)
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
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"
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
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
Treehugger Robot [Tue, 22 May 2018 16:28:29 +0000 (16:28 +0000)]
Merge "gatt_api: Avoid possible NULL dereference"
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
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
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
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
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
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
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
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
Jakub Pawlowski [Tue, 22 May 2018 00:24:09 +0000 (17:24 -0700)]
Simplify bta_gattc_sdp_callback
am:
cabb39c432
Change-Id: I22016fd73cb6b01bb56aa82c712c8c1dbdcdc09f
Jack He [Tue, 22 May 2018 00:09:29 +0000 (17:09 -0700)]
HFP: Set audio handle for active device during incoming call
* Set audio handle for active device during incoming call
* Change debug level logging to warning level when SCO is not allowed to
open or when RING command is not allowed to be sent
Bug:
77949569
Test: connect with HFP devices and receive incoming call
Change-Id: Ibc2caf740f94817ae725786e35e8592390167ce2
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