OSDN Git Service
Jakub Pawlowski [Sat, 3 Mar 2018 00:46:21 +0000 (00:46 +0000)]
Merge "Keep UIPC in local variable, rather than global struct." am:
80086efc10 am:
57b9b3da98
am:
c8d395a371
Change-Id: Id99ea80a12ecf223865bd6081ec28c2a3d4ad6af
Jakub Pawlowski [Sat, 3 Mar 2018 00:33:56 +0000 (00:33 +0000)]
Merge "Keep UIPC in local variable, rather than global struct." am:
80086efc10
am:
57b9b3da98
Change-Id: I3f276195258d503072a4b3d7876e95fa349e782e
Jakub Pawlowski [Sat, 3 Mar 2018 00:09:02 +0000 (00:09 +0000)]
Merge "Keep UIPC in local variable, rather than global struct."
am:
80086efc10
Change-Id: I61c460adbdf6fc653599894f1a11469647d7467d
Treehugger Robot [Fri, 2 Mar 2018 19:05:58 +0000 (19:05 +0000)]
Merge "Keep UIPC in local variable, rather than global struct."
Jakub Pawlowski [Fri, 2 Mar 2018 17:26:27 +0000 (17:26 +0000)]
Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_24000 am:
bd39c6ee08 am:
26ff71d81c
am:
1d615f337a
Change-Id: I0b7fbf4917c0ff32c7bbbf0f00d80b355d6fb7bf
Jakub Pawlowski [Fri, 2 Mar 2018 17:20:23 +0000 (17:20 +0000)]
Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_24000 am:
bd39c6ee08
am:
26ff71d81c
Change-Id: I74ebdd66a1ea995acdab7ac877f44d3fb324a5ff
Jakub Pawlowski [Fri, 2 Mar 2018 17:14:20 +0000 (17:14 +0000)]
Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_24000
am:
bd39c6ee08
Change-Id: I0637185dd3175f307f50cca156d99d4543d8d97b
Jakub Pawlowski [Fri, 2 Mar 2018 00:23:58 +0000 (16:23 -0800)]
Keep UIPC in local variable, rather than global struct.
We will need multiple instances of UIPC.
Bug:
69623109
Test: play music using A2DP
Change-Id: Ie95f5272c92b5540034ebd166dbe10ea5b2b86a1
Jakub Pawlowski [Fri, 2 Mar 2018 09:56:09 +0000 (01:56 -0800)]
Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_24000
Test: compilation
Bug:
69623109
Change-Id: Ieffdd6e27ada8cbf221cfa7d1c0648aeb1c89be1
Jakub Pawlowski [Fri, 2 Mar 2018 01:11:30 +0000 (01:11 +0000)]
Hearing Aid BTIF interface implementation am:
89b0ccb034 am:
4739eb2604
am:
dc5cef4570
Change-Id: If109b8d6c4be7f23d5e64e0671434c48ae4f0e41
Jakub Pawlowski [Fri, 2 Mar 2018 01:05:55 +0000 (01:05 +0000)]
Hearing Aid BTIF interface implementation am:
89b0ccb034
am:
4739eb2604
Change-Id: I74ef2c07346e3a36559da08df605c71d6dbf3ac0
Jakub Pawlowski [Fri, 2 Mar 2018 01:00:21 +0000 (01:00 +0000)]
Hearing Aid BTIF interface implementation
am:
89b0ccb034
Change-Id: I93c072bbf8c774c7380e01558bbe6226eca6a431
Jakub Pawlowski [Thu, 1 Mar 2018 06:44:42 +0000 (22:44 -0800)]
Hearing Aid BTIF interface implementation
Boilerplate code - thread switching, logging and attaching to BTIF
infrastructure.
Test: manual with hearing aid
Bug:
69623109
Change-Id: I34a6542827a581a2fbe0b53e7220b7ff7ecbf540
Pavlin Radoslavov [Thu, 1 Mar 2018 23:47:25 +0000 (23:47 +0000)]
Merge "Multi-A2DP: stop or flush the A2DP queue only for Active peer" am:
a41496e745 am:
75a3b04686
am:
4fbed8edc9
Change-Id: I00296cb65bb3651c4837efa19cf8629482672942
Pavlin Radoslavov [Thu, 1 Mar 2018 23:41:50 +0000 (23:41 +0000)]
Merge "Multi-A2DP: stop or flush the A2DP queue only for Active peer" am:
a41496e745
am:
75a3b04686
Change-Id: Id9ee9b100e927806a70ae23ab4a9abc88c858fb7
Pavlin Radoslavov [Thu, 1 Mar 2018 23:36:51 +0000 (23:36 +0000)]
Merge "Multi-A2DP: stop or flush the A2DP queue only for Active peer"
am:
a41496e745
Change-Id: Ib1116eb7258d4cb74b2276290b574398c6a213b6
Treehugger Robot [Thu, 1 Mar 2018 23:27:53 +0000 (23:27 +0000)]
Merge "Multi-A2DP: stop or flush the A2DP queue only for Active peer"
Jakub Pawlowski [Thu, 1 Mar 2018 23:25:50 +0000 (23:25 +0000)]
Merge "Hearing Aid BTA interface" am:
14e1e30fac am:
9ebb9daaff
am:
b8102df401
Change-Id: Ic3ce9229e6ccf5eafcc00f46e4765f0cab87a350
Jakub Pawlowski [Thu, 1 Mar 2018 23:20:09 +0000 (23:20 +0000)]
Merge "Hearing Aid BTA interface" am:
14e1e30fac
am:
9ebb9daaff
Change-Id: Ib09383f8d822f247e33b2daa38f2721cfb784968
Jakub Pawlowski [Thu, 1 Mar 2018 23:15:05 +0000 (23:15 +0000)]
Merge "Hearing Aid BTA interface"
am:
14e1e30fac
Change-Id: I170b4bda5887f7153c23846fadabab96ba0df4f9
Treehugger Robot [Thu, 1 Mar 2018 23:06:08 +0000 (23:06 +0000)]
Merge "Hearing Aid BTA interface"
Jakub Pawlowski [Thu, 1 Mar 2018 22:44:48 +0000 (22:44 +0000)]
Merge "Call BTA_VendorCleanup on proper thread" am:
1184ac335f am:
443d139e6d
am:
4f4cac2fc5
Change-Id: Ia8fd705c19c01302cfca190371bc966f2380fc85
Jakub Pawlowski [Thu, 1 Mar 2018 22:39:13 +0000 (22:39 +0000)]
Merge "Call BTA_VendorCleanup on proper thread" am:
1184ac335f
am:
443d139e6d
Change-Id: I2b888dfab03d4ef0e76d7a45bbcb27bca06937d6
Jakub Pawlowski [Thu, 1 Mar 2018 22:34:31 +0000 (22:34 +0000)]
Merge "Call BTA_VendorCleanup on proper thread"
am:
1184ac335f
Change-Id: Ifca440266846548be8a99ec5ab68c07f16e9e8be
Treehugger Robot [Thu, 1 Mar 2018 22:21:29 +0000 (22:21 +0000)]
Merge "Call BTA_VendorCleanup on proper thread"
Pavlin Radoslavov [Thu, 1 Mar 2018 21:59:57 +0000 (21:59 +0000)]
Merge "Pre-compute the RTP Header Marker Bit by using the correct peer address" am:
60828d0b79 am:
c4fd2f56f3
am:
dd2a46767d
Change-Id: I619f1d8cd1bde7f8262c90170ca74aaf9604e4d5
Pavlin Radoslavov [Thu, 1 Mar 2018 21:41:15 +0000 (21:41 +0000)]
Merge "Pre-compute the RTP Header Marker Bit by using the correct peer address" am:
60828d0b79
am:
c4fd2f56f3
Change-Id: I951a47389fbd77c11e18ab1bf1a69a3e826b3a0a
Pavlin Radoslavov [Thu, 1 Mar 2018 21:36:20 +0000 (21:36 +0000)]
Merge "Pre-compute the RTP Header Marker Bit by using the correct peer address"
am:
60828d0b79
Change-Id: I98cff1eabab01255ec3137c7636df23aa6dcb7fd
Ajay Panicker [Thu, 1 Mar 2018 21:36:02 +0000 (21:36 +0000)]
Remove unused adjustAvrcpAbsoluteVolume am:
ce268fc86f am:
1b9a56c06e
am:
b7c1d96ed9
Change-Id: I29ffe4a3d5160583e9d0db0d8384425004d04443
Ajay Panicker [Thu, 1 Mar 2018 21:27:40 +0000 (21:27 +0000)]
Remove unused adjustAvrcpAbsoluteVolume am:
ce268fc86f
am:
1b9a56c06e
Change-Id: Ieffa12079ae84434d51b2fc02fb1e74c5d4c12a4
Ajay Panicker [Thu, 1 Mar 2018 21:15:48 +0000 (21:15 +0000)]
Remove unused adjustAvrcpAbsoluteVolume
am:
ce268fc86f
Change-Id: I9a3df5c69021d252469bab429557fdfcd8be6756
Pavlin Radoslavov [Thu, 1 Mar 2018 16:26:43 +0000 (08:26 -0800)]
Multi-A2DP: stop or flush the A2DP queue only for Active peer
The A2DP queue should be flushed or the A2DP Tx/Rx operations
should be stopped only for the Active peer.
Otherwise, disconnecting a non-active A2DP Peer stops audio
output for the Active peer.
Bug:
73956686
Test: Manual: Connect two A2DP Sink devices, play music on the
Active device, disconnect the non-Active device
Change-Id: I32a624c012ef2cd9ef0057f7289a6ed713f88039
Jakub Pawlowski [Thu, 1 Mar 2018 06:59:32 +0000 (22:59 -0800)]
Hearing Aid BTA interface
This is the interface between the btif and bta layer, and also between
the profile implementation and audio source.
Submitting it in separate CL allows us to split the work on those
submodules.
Bug:
64038649
Test: compilation
Change-Id: I40663df4e3d8cfb401f9da6084b7212b7bdbcc8c
Jakub Pawlowski [Thu, 1 Mar 2018 19:54:16 +0000 (11:54 -0800)]
Call BTA_VendorCleanup on proper thread
Right now this function is running on any thread that call it, i.e. one
of Binder threads. This is introducing race condition during shutdown.
Test: restart bluetooth 10 times
Fix:
74075027
Change-Id: I426284792901e6a9540cb6420a7e27a340a3fe1d
Treehugger Robot [Thu, 1 Mar 2018 20:01:02 +0000 (20:01 +0000)]
Merge "Pre-compute the RTP Header Marker Bit by using the correct peer address"
Ajay Panicker [Wed, 28 Feb 2018 19:38:26 +0000 (11:38 -0800)]
Remove unused adjustAvrcpAbsoluteVolume
The AudioManager now handles all calculations for volume stepping now
and no longer uses adjustAvrcpAbsoluteVolume.
Bug:
68812037
Test: Compile and test Absolute Volume on a device that supports it
Change-Id: I34f27d27b4c5c3959a84a6dc438edfed45a0b3e3
Jakub Pawlowski [Thu, 1 Mar 2018 19:04:59 +0000 (19:04 +0000)]
Hearing Aid Audio HAL am:
e470502f78 am:
4f2cd4ab14
am:
b1b1592839
Change-Id: I51804748391ebd8ef093d25f67c7188998c032be
Jakub Pawlowski [Thu, 1 Mar 2018 18:58:58 +0000 (18:58 +0000)]
Hearing Aid Audio HAL am:
e470502f78
am:
4f2cd4ab14
Change-Id: Iafd0efe54cda8f45d0ffcf4c1354909ef20720e5
Jakub Pawlowski [Thu, 1 Mar 2018 18:53:23 +0000 (18:53 +0000)]
Hearing Aid Audio HAL
am:
e470502f78
Change-Id: I72fa69c741e41e5ada66366bf74c56d510b503c4
Jakub Pawlowski [Fri, 23 Feb 2018 21:55:48 +0000 (13:55 -0800)]
Hearing Aid Audio HAL
The code is cloned from the existing A2DP Audio HAL.
In the future it will expand to include hearing-aid specific
mechanism.
Test: code compilation
Bug:
64038649
Change-Id: I976aa189929c3051b83615d1536315a099f31a67
Jakub Pawlowski [Thu, 1 Mar 2018 10:48:53 +0000 (10:48 +0000)]
Merge "Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000" am:
25e8404e41 am:
574521702c
am:
cd18915868
Change-Id: I98af33e39e090367bec0374feefb8efcf1410059
Jakub Pawlowski [Thu, 1 Mar 2018 10:42:17 +0000 (10:42 +0000)]
Merge "Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000" am:
25e8404e41
am:
574521702c
Change-Id: I0c36ce7b5e23021815b50e78f6cf57579d68e4fc
Jakub Pawlowski [Thu, 1 Mar 2018 10:36:14 +0000 (10:36 +0000)]
Merge "Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000"
am:
25e8404e41
Change-Id: Ib80ac8807087f9521e8ae50e42bfee41f0fca75e
Treehugger Robot [Thu, 1 Mar 2018 10:25:39 +0000 (10:25 +0000)]
Merge "Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000"
Pavlin Radoslavov [Thu, 1 Mar 2018 07:34:28 +0000 (23:34 -0800)]
Pre-compute the RTP Header Marker Bit by using the correct peer address
The RTP Header Marker Bit is computed by using the peer address
to lookup the corresponding codec instead of using the codec
for the current active peer.
Also, the pre-computed result is stored in the SCB for the peer instead
of storing a pointer to the current codec config.
Bug:
73897470
Test: Manual - disconnect, reconnect A2DP headsets
Change-Id: Id015de7be2a297b86ac945c7b7c64e6bc13ffc42
Jakub Pawlowski [Thu, 1 Mar 2018 06:16:37 +0000 (06:16 +0000)]
Hearing Aid BTIF interface am:
e893179687 am:
98c4f3dc93
am:
64b217e747
Change-Id: Ib3fa2b2167f624f37aacb3b8c60d3c81f0e12691
Jakub Pawlowski [Thu, 1 Mar 2018 06:06:51 +0000 (06:06 +0000)]
Hearing Aid BTIF interface am:
e893179687
am:
98c4f3dc93
Change-Id: Ia4012cb831b8375341248f70dca6c130e035c275
Jakub Pawlowski [Thu, 1 Mar 2018 06:01:49 +0000 (06:01 +0000)]
Hearing Aid BTIF interface
am:
e893179687
Change-Id: Ie7b1229491ce78d8ebe286efee7ca2d87369ec50
Jakub Pawlowski [Thu, 1 Mar 2018 02:40:33 +0000 (18:40 -0800)]
Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000
Test: compilation
Bug:
69623109
Change-Id: Ib7c94c538d8636719658814d2a73bc997ab6dddc
Jakub Pawlowski [Wed, 22 Nov 2017 00:35:49 +0000 (16:35 -0800)]
Hearing Aid BTIF interface
This is first version of Hearing Aid interface.
Test: compilation
Bug:
69623109
Change-Id: I157dc8d1481c1f034c15aac7dd33a5103cf5ea14
Pavlin Radoslavov [Tue, 27 Feb 2018 08:56:53 +0000 (08:56 +0000)]
Merge changes from topics "bt-a2dp-remove-redundant-alarm-free", "bt-a2dp-codec-init-same-thread" am:
51a906ba83 am:
c42440e9fd
am:
558f91732b
Change-Id: I69f764eaeb2fe1ecbdd6f485bc52d9112441beab
Pavlin Radoslavov [Tue, 27 Feb 2018 08:50:55 +0000 (08:50 +0000)]
Merge changes from topics "bt-a2dp-remove-redundant-alarm-free", "bt-a2dp-codec-init-same-thread" am:
51a906ba83
am:
c42440e9fd
Change-Id: I96720bd109901351ab4b7818746ce34a8488f259
Pavlin Radoslavov [Tue, 27 Feb 2018 08:44:34 +0000 (08:44 +0000)]
Clear the A2DP active device within the native stack during cleanup am:
2b13eb7b2a am:
a706aab6c9
am:
771177dcb0
Change-Id: I1d646069ed402e9555ca94b718e9d128a9a7954a
Pavlin Radoslavov [Tue, 27 Feb 2018 08:44:26 +0000 (08:44 +0000)]
Merge changes from topics "bt-a2dp-remove-redundant-alarm-free", "bt-a2dp-codec-init-same-thread"
am:
51a906ba83
Change-Id: I4541641e477796c0ddcaa4cceb7df9bac300cd3f
Pavlin Radoslavov [Tue, 27 Feb 2018 08:38:58 +0000 (08:38 +0000)]
Clear the A2DP active device within the native stack during cleanup am:
2b13eb7b2a
am:
a706aab6c9
Change-Id: Ib842c8828ba798b5db70b8eb742e6ddeeecd59fe
Treehugger Robot [Tue, 27 Feb 2018 08:37:13 +0000 (08:37 +0000)]
Merge changes from topics "bt-a2dp-remove-redundant-alarm-free", "bt-a2dp-codec-init-same-thread"
* changes:
Removed redundant alarm_free() call on the wrong thread
Perform all codec-related init operations on the same thread
Pavlin Radoslavov [Tue, 27 Feb 2018 08:33:23 +0000 (08:33 +0000)]
Clear the A2DP active device within the native stack during cleanup
am:
2b13eb7b2a
Change-Id: I996cde9085b3cff94044b359b080a8e5404bfc17
Pavlin Radoslavov [Tue, 27 Feb 2018 07:16:43 +0000 (23:16 -0800)]
Removed redundant alarm_free() call on the wrong thread
Bug:
73741079
Bug:
73892830
Test: Manual - A2DP connect/disconnect; audio streaming
Change-Id: I3e553245ef5ac10835d08b78e52a3fbd945914ee
Pavlin Radoslavov [Tue, 27 Feb 2018 06:44:30 +0000 (22:44 -0800)]
Perform all codec-related init operations on the same thread
Renamed btif_a2dp_source_encoder_init_event() to
btif_a2dp_source_setup_codec_delayed() and moved the
peer parameter fetching from btif_a2dp_source_setup_codec()
to btif_a2dp_source_setup_codec_delayed()
Test: Manual - A2DP connect/disconnect; audio streaming
Change-Id: Ib29dd6b2bef3045be3727122e1f8608780921d98
Pavlin Radoslavov [Tue, 27 Feb 2018 06:53:05 +0000 (22:53 -0800)]
Clear the A2DP active device within the native stack during cleanup
Use explicit SetActivePeer(RawAddress::kEmpty) for BtifAvSource and
BtifAvSink during Cleanup()
Also, replaced incorrectly classified BTIF_TRACE_WARNING() log messages
with LOG_INFO().
Bug:
73832547
Test: Manual - A2DP streaming, enable Location -> Bluetooth scanning,
restart Bluetooth in Quick Settings
Change-Id: Ieeae8915a45dc0c98cd68bd4bb113424c2de74d9
Pavlin Radoslavov [Tue, 27 Feb 2018 04:57:51 +0000 (04:57 +0000)]
Initialize max number of connected A2DP devices in the native stack via JNI am:
235bfcc900 am:
f81f580d62
am:
f6edd0e209
Change-Id: Iaacc987b8b9b080893ba213cac8d5770fec6c60b
Pavlin Radoslavov [Tue, 27 Feb 2018 04:53:00 +0000 (04:53 +0000)]
Initialize max number of connected A2DP devices in the native stack via JNI am:
235bfcc900
am:
f81f580d62
Change-Id: I5b1a9f562e8d94930e3b439ac60900097a18ef9e
Pavlin Radoslavov [Tue, 27 Feb 2018 04:47:56 +0000 (04:47 +0000)]
Initialize max number of connected A2DP devices in the native stack via JNI
am:
235bfcc900
Change-Id: I4ee35ac53e2258dd4e5c9b2b52425e1d44726c51
Pavlin Radoslavov [Tue, 27 Feb 2018 03:16:05 +0000 (19:16 -0800)]
Initialize max number of connected A2DP devices in the native stack via JNI
Pass the maximum number of connected A2DP devices from Java to the
native stack as a parameter to the init() call.
Bug:
72351654
Test: Manual: Connect to multiple A2DP devices, check the log messages
Change-Id: I0647c36fe7c6a2df2c42a60b53b5cf505160b1e6
Pavlin Radoslavov [Tue, 27 Feb 2018 02:11:43 +0000 (02:11 +0000)]
Merge "Add/update the BTIF A2DP log messages" am:
fe5a83841b am:
186d7623c3
am:
e2afac32ae
Change-Id: Ied7b25c5410888d68898655b91682b0d70d5ee17
Pavlin Radoslavov [Tue, 27 Feb 2018 01:55:33 +0000 (01:55 +0000)]
Merge "Add/update the BTIF A2DP log messages" am:
fe5a83841b
am:
186d7623c3
Change-Id: I8a0d1fdbc6974add2b00479bf37c01be03b9de09
Pavlin Radoslavov [Tue, 27 Feb 2018 01:47:09 +0000 (01:47 +0000)]
Merge "Add/update the BTIF A2DP log messages"
am:
fe5a83841b
Change-Id: Iaf15b40373679c2b505ad984ca89a6a396e81537
Treehugger Robot [Tue, 27 Feb 2018 01:02:21 +0000 (01:02 +0000)]
Merge "Add/update the BTIF A2DP log messages"
Myles Watson [Tue, 27 Feb 2018 00:55:08 +0000 (00:55 +0000)]
HCI: Set a timer to abort after a timeout am:
5c550c1e1c am:
7f56fc5da4
am:
6a005bc2ac
Change-Id: Id83a6f15ca59928c6cc08a4514b8f8662a8f4ec5
Myles Watson [Tue, 27 Feb 2018 00:45:08 +0000 (00:45 +0000)]
HCI: Set a timer to abort after a timeout am:
5c550c1e1c
am:
7f56fc5da4
Change-Id: I618fd2b02730b5653492f6725759f6aa75c61ae6
Myles Watson [Tue, 27 Feb 2018 00:37:34 +0000 (00:37 +0000)]
HCI: Set a timer to abort after a timeout
am:
5c550c1e1c
Change-Id: Ifb20e40988b4f36747fb5c008b363807e4638762
Myles Watson [Sat, 24 Feb 2018 01:28:23 +0000 (17:28 -0800)]
HCI: Set a timer to abort after a timeout
Add code to clean up the timer and close the file whether
abort gets called or not.
Bug:
72719600
Bug:
72474659
Test: Cause an HCI timeout and wait for the firmware dump
Change-Id: I713f440d77bfad4c9f17dfc57f98ba5bada37fff
Pavlin Radoslavov [Mon, 26 Feb 2018 20:08:22 +0000 (12:08 -0800)]
Add/update the BTIF A2DP log messages
* Added new log messages where needed
* Updated existing log messages so the message format is more aligned
with the rest of the messages
Test: Manual: A2DP streaming
Change-Id: I9f953c43df1ff415379bb7d7fb61f0d33760df30
Jakub Pawlowski [Mon, 26 Feb 2018 18:42:09 +0000 (18:42 +0000)]
Use assigned UUID for Hearing Aid Service am:
8f081e4575 am:
8077e8b744
am:
0b2912004b
Change-Id: Ie91ddc7e2f25a9edd09a1bc2581a8e31b1fb7133
Jakub Pawlowski [Mon, 26 Feb 2018 18:34:07 +0000 (18:34 +0000)]
Use assigned UUID for Hearing Aid Service am:
8f081e4575
am:
8077e8b744
Change-Id: I3c0dff85400414500b7976c31641ef3de4a07e1a
Jakub Pawlowski [Mon, 26 Feb 2018 18:26:02 +0000 (18:26 +0000)]
Use assigned UUID for Hearing Aid Service
am:
8f081e4575
Change-Id: I449b645b0a9e03ecd3bfbaa6d4f527b736466546
Jakub Pawlowski [Thu, 22 Feb 2018 23:02:25 +0000 (15:02 -0800)]
Use assigned UUID for Hearing Aid Service
Test: manual
Bug:
64038649
Change-Id: Ie5b39d74d245373142be31027cccb5f51f8586bf
Pavlin Radoslavov [Sat, 24 Feb 2018 05:16:01 +0000 (05:16 +0000)]
Merge "Add explicit init/cleanup steps for A2DP Source and Sink" am:
90835897a0 am:
b2f2d655a4
am:
6d10b26229
Change-Id: I359a5d93bb34f00a49fa3dc44102dc79bb9ec3d9
Pavlin Radoslavov [Sat, 24 Feb 2018 05:08:55 +0000 (05:08 +0000)]
Merge "Add explicit init/cleanup steps for A2DP Source and Sink" am:
90835897a0
am:
b2f2d655a4
Change-Id: I465e06d2ac58f5cd46dd9a06561044cb42872d8f
Pavlin Radoslavov [Sat, 24 Feb 2018 05:01:49 +0000 (05:01 +0000)]
Merge "Add explicit init/cleanup steps for A2DP Source and Sink"
am:
90835897a0
Change-Id: I5266a9852d4a9897c5283536baf07407f3ae4168
Treehugger Robot [Sat, 24 Feb 2018 04:49:57 +0000 (04:49 +0000)]
Merge "Add explicit init/cleanup steps for A2DP Source and Sink"
Manoj Babulal [Sat, 24 Feb 2018 04:33:04 +0000 (04:33 +0000)]
L2CAP: Discard pending requests on link disconnect am:
72b71ec6d1 am:
b23ed0c092
am:
f9e7b6723c
Change-Id: Ifec8e42880023f2f8b537b90c8545e50440c8b37
Manoj Babulal [Sat, 24 Feb 2018 04:26:01 +0000 (04:26 +0000)]
L2CAP: Discard pending requests on link disconnect am:
72b71ec6d1
am:
b23ed0c092
Change-Id: I89f651749f8f549309f6c768424e3b751aa748a9
Manoj Babulal [Sat, 24 Feb 2018 04:17:56 +0000 (04:17 +0000)]
L2CAP: Discard pending requests on link disconnect
am:
72b71ec6d1
Change-Id: I79efe45e43f578e11256ce054744172320bfa02c
Pavlin Radoslavov [Fri, 23 Feb 2018 17:04:57 +0000 (09:04 -0800)]
Add explicit init/cleanup steps for A2DP Source and Sink
The startup/shutdown steps for A2DP Source and Sink
are done when setting/resetting the Active device, and this
implies the device has been connected.
The operations that must be done before the remote device
is connected are moved to init (and cleanup for the reverse operations)
Bug:
73832547
Test: Manual - Connect/disconnect/play A2DP to Headset
Change-Id: Iaa55c2d27443646111f07a53d2c5163bca9e256d
Manoj Babulal [Thu, 13 Jul 2017 07:04:09 +0000 (12:34 +0530)]
L2CAP: Discard pending requests on link disconnect
Scenario: A connection request packet is admitted to link tx queue in
L2CAP but before it could be transmitted (host busy), ACL link can get
disconnected (idle timeout) and the link tx queue is not flushed during
link disconnect handling. In such scenario, subsequent connection
attempt by host is seen to fail. This is because host is found to send
multiple connection requests (one connect request packet from the queue
and a new connection request packet per new request). Remote accepts old
connection request packet and waits for connection response from host.
For next connection request seen by remote, remote responds with 'No
PSM' resource error (as it already admitted one connection request and
it is in progress). Here when the connection response arrives from
remote, host ignores it because it sees packet id mismatch (host had
sent old connection request first and later information request/response
packets were exchanged. Remote had sent connection response copying
stale packet id picked from old connection request).
Drop queued packets as part of link disconnection handling.
This was already done in BLE transport case and is now being done
unconditionally.
Fixes:
73050475
Test: back-to-back PAN connect-disconnect iterations amidst ongoing
OPP file transfer and AV streaming
Change-Id: I42cc7ae90cc1152f1781282698529fe50f0ebf89
Ajay Panicker [Fri, 23 Feb 2018 22:40:57 +0000 (22:40 +0000)]
Uprev to AVDTP 1.3 and Implement AVDTP delay reports am:
ef673c546c am:
2b733c7748
am:
71898f3473
Change-Id: Ica1ada711b2a3b58b6c25c6479b9ab44ecaa809f
Ajay Panicker [Fri, 23 Feb 2018 22:32:26 +0000 (22:32 +0000)]
Uprev to AVDTP 1.3 and Implement AVDTP delay reports am:
ef673c546c
am:
2b733c7748
Change-Id: If9fc6d0d6520a3fbfa90694da90579a131743864
Ajay Panicker [Fri, 23 Feb 2018 22:25:25 +0000 (22:25 +0000)]
Uprev to AVDTP 1.3 and Implement AVDTP delay reports
am:
ef673c546c
Change-Id: I8efa11b2f70f97d0a78df496cb3119ac452d6896
Ajay Panicker [Wed, 21 Dec 2016 23:37:34 +0000 (15:37 -0800)]
Uprev to AVDTP 1.3 and Implement AVDTP delay reports
Implement receiving the delay report message which requires AVDTP 1.3.
Also start keeping track of total number of audio bytes sent over the
air. We now will report both of these values to the audio HAL so that
they can adjust audio playback using these values.
Bug:
32755225
Test: Manual test with a device that supports delay reporting
Testtracker: 145280
Change-Id: I22c1c6401e4912efab06fa56fb582faae4b38eaf
Yi Kong [Fri, 23 Feb 2018 19:01:52 +0000 (19:01 +0000)]
Merge "Remove unreachable code" am:
c92e4a58de am:
ea3e94b30b
am:
3e06dee44e
Change-Id: If08ba62571e78a9f9b0e83999e484412bcbc90be
Yi Kong [Fri, 23 Feb 2018 18:55:47 +0000 (18:55 +0000)]
Merge "Remove unreachable code" am:
c92e4a58de
am:
ea3e94b30b
Change-Id: I7945786cccb01bcbaff473c76a210d2540c386ed
Yi Kong [Fri, 23 Feb 2018 18:50:15 +0000 (18:50 +0000)]
Merge "Remove unreachable code"
am:
c92e4a58de
Change-Id: Id9ab73026b0cf09ee78aa07832414846b4d48856
Treehugger Robot [Fri, 23 Feb 2018 18:32:54 +0000 (18:32 +0000)]
Merge "Remove unreachable code"
Pavlin Radoslavov [Fri, 23 Feb 2018 17:55:30 +0000 (17:55 +0000)]
Free the A2DP Source media alarm on the A2DP Source worker thread am:
cc38c7fb41 am:
d88539b7c1
am:
353ab42390
Change-Id: I7a2a57805846fe3b423a61926d840690c4a3d29f
Pavlin Radoslavov [Fri, 23 Feb 2018 17:43:00 +0000 (17:43 +0000)]
Free the A2DP Source media alarm on the A2DP Source worker thread am:
cc38c7fb41
am:
d88539b7c1
Change-Id: I6de0382140faa536688580741cf990326c5baca0
Pavlin Radoslavov [Fri, 23 Feb 2018 17:32:42 +0000 (17:32 +0000)]
Free the A2DP Source media alarm on the A2DP Source worker thread
am:
cc38c7fb41
Change-Id: I03ca80ed2cdeae946b0f6862268e90491a8fbe8c
Pavlin Radoslavov [Fri, 23 Feb 2018 11:35:37 +0000 (03:35 -0800)]
Free the A2DP Source media alarm on the A2DP Source worker thread
Move the alarm_free() for the A2DP Source media alarm from
btif_a2dp_source_shutdown() to btif_a2dp_source_shutdown_delayed().
The latter is executed on the btif_a2dp_source_thread.
This avoids a race condition with btif_a2dp_source_audio_tx_stop_event()
that also might attempt to free the same alarm.
Test: Manual - unpair A2DP device while A2DP streaming.
Bug:
73741079
Change-Id: Ia871fcbeaae7c351878228e7605e65307a3d1583
Pavlin Radoslavov [Thu, 22 Feb 2018 04:19:50 +0000 (04:19 +0000)]
Correct the value for BT_RC_NUM_APP for Multi-A2DP / Multi-AVRCP am:
bd74060ea5 am:
7ef5392600
am:
86db465e49
Change-Id: I261c452236c4036a9e8cd047bd74d3e0f2fd7fcd
Pavlin Radoslavov [Thu, 22 Feb 2018 04:04:23 +0000 (04:04 +0000)]
Correct the value for BT_RC_NUM_APP for Multi-A2DP / Multi-AVRCP am:
bd74060ea5
am:
7ef5392600
Change-Id: Ia80352e3a11d5e1bc72ed9527dc256dd4d4a96a8