OSDN Git Service
Jakub Pawlowski [Thu, 12 Jul 2018 09:24:35 +0000 (02:24 -0700)]
[automerger skipped] [automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2 skipped:
529df1e98d am:
b762422828 -s ours am:
9600a8ce06 -s ours
am:
72d86860ac -s ours
Change-Id: Ib93613543c84e381605f6689d0f439731650053f
Jakub Pawlowski [Thu, 12 Jul 2018 09:20:56 +0000 (02:20 -0700)]
[automerger skipped] [automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2 skipped:
529df1e98d am:
b762422828 -s ours
am:
9600a8ce06 -s ours
Change-Id: I772f355ae6699136699dff7ebcee574ba4affa92
Jakub Pawlowski [Thu, 12 Jul 2018 09:18:02 +0000 (02:18 -0700)]
[automerger skipped] [automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2 skipped:
529df1e98d
am:
b762422828 -s ours
Change-Id: I39b1ceb8ebb02b5a05d7d7a5d086624b9d7a4d1c
Android Build Merger (Role) [Thu, 12 Jul 2018 07:42:03 +0000 (07:42 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2 skipped:
529df1e98d
Change-Id: If7e8de188370113ced4bb81c9a31b73eb6669512
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:26 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2
Change-Id: I4d8b0fd5c2b026105e169eb35b3e34de72f5b503
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:24 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975
Change-Id: Iddf996897230996becbf4f1975fb97b80edbd71a
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:21 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54
Change-Id: I4aa5b4cd6f852466c6233c9afb51165c06c4616b
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:18 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05
Change-Id: Ie004d032313f29c4124c2a114469886429c4cccd
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:15 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c
Change-Id: I95b70f63b81df6f58b516b83853fc0bbef7eccc8
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:12 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624
Change-Id: Idb5ac3b18ec180a90eca120754d601c1ba68edbf
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:10 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca
Change-Id: I3e68fbd29ce151c4829fe6077d76bc3822915c8f
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:07 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d
Change-Id: Ic7b10e46c591edff7f86c06dee6beb8ca8798121
Jakub Pawlowski [Fri, 22 Jun 2018 11:46:39 +0000 (04:46 -0700)]
SDP: return error on offset bigger than atribute length
Test: none
Bug:
79217770
Change-Id: I8b594882dd07644b1a747c53d6166db466b7e998
Merged-In: I8b594882dd07644b1a747c53d6166db466b7e998
Hansong Zhang [Wed, 11 Jul 2018 21:42:35 +0000 (14:42 -0700)]
[automerger skipped] Merge "HFP: Fix out of bound access in phone number processing" into oc-dev am:
6208c7956b -s ours am:
e5e17f0c15 -s ours
am:
d9273e6d60 -s ours
Change-Id: I238cd63a04e1cc4fefbb2a0d2d05fd6acbecf4e3
Hansong Zhang [Wed, 11 Jul 2018 21:28:57 +0000 (14:28 -0700)]
[automerger skipped] Merge "HFP: Fix out of bound access in phone number processing" into oc-dev am:
6208c7956b -s ours
am:
e5e17f0c15 -s ours
Change-Id: I5099a757887f9ce0bae4deef4b907633f959607a
Hansong Zhang [Wed, 11 Jul 2018 21:16:23 +0000 (14:16 -0700)]
[automerger skipped] Merge "HFP: Fix out of bound access in phone number processing" into oc-dev
am:
6208c7956b -s ours
Change-Id: If89074b33649f8956290d26ce9471a36806b9706
Jakub Pawlowski [Wed, 11 Jul 2018 21:14:29 +0000 (14:14 -0700)]
SDP: return error on offset bigger than atribute length am:
0a74ffa44c am:
ff7a2e2592
am:
3705504f14
Change-Id: I24311f5a87dbf5dc8e42516ece159013aa241da8
Jakub Pawlowski [Wed, 11 Jul 2018 21:06:23 +0000 (14:06 -0700)]
SDP: return error on offset bigger than atribute length am:
0a74ffa44c
am:
ff7a2e2592
Change-Id: Id673cf366e28adbd86943caf52d324e23ac95ad8
TreeHugger Robot [Wed, 11 Jul 2018 21:02:39 +0000 (21:02 +0000)]
Merge "HFP: Fix out of bound access in phone number processing" into oc-dev
Jakub Pawlowski [Wed, 11 Jul 2018 20:56:08 +0000 (13:56 -0700)]
SDP: return error on offset bigger than atribute length
am:
0a74ffa44c
Change-Id: If4811a2a90eec03ab430420ff830aac96abb1590
Jakub Pawlowski [Fri, 22 Jun 2018 11:46:39 +0000 (04:46 -0700)]
SDP: return error on offset bigger than atribute length
Test: none
Bug:
79217770
Change-Id: I8b594882dd07644b1a747c53d6166db466b7e998
Jack He [Wed, 11 Jul 2018 17:53:49 +0000 (10:53 -0700)]
[automerger skipped] Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev am:
68f3762633 am:
0a352983a9
am:
554ff6982b -s ours
Change-Id: I35939f88eb27e519438bf2e8a6424e2cd051bda1
Jack He [Wed, 11 Jul 2018 17:51:41 +0000 (10:51 -0700)]
Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev am:
68f3762633
am:
0a352983a9
Change-Id: I0ab90774f01847db0fd45c611ed5a78c51282abb
Jack He [Wed, 11 Jul 2018 17:44:52 +0000 (10:44 -0700)]
Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev
am:
68f3762633
Change-Id: I9a3b92eac44c572db7efc30b937f499808098bd6
Hansong Zhang [Wed, 11 Jul 2018 17:42:32 +0000 (10:42 -0700)]
Merge "HIDD: Prevent integer underflow in bta_hd_act" into oc-dev am:
7845f60787 am:
91d327b4af
am:
fc512cb299
Change-Id: I497e0a98cbd008f5e10ed30f2a9712cd1162b469
Hansong Zhang [Wed, 11 Jul 2018 17:38:26 +0000 (10:38 -0700)]
Merge "HIDD: Prevent integer underflow in bta_hd_act" into oc-dev am:
7845f60787
am:
91d327b4af
Change-Id: I8871cc22dd5a5166e3a63c412b1f22039f6ecf84
Hansong Zhang [Wed, 27 Jun 2018 21:26:40 +0000 (14:26 -0700)]
HFP: Fix out of bound access in phone number processing
* Write at most sizeof(dialnum) chars into dialnum array in ClccResponse
method
* Write at most sizeof(ag_res.str) - 5 chars into ag_res.str array in
PhoneStateChange method
Bug:
79431031
Bug:
79266386
Test: make call with super long phone numbers
Change-Id: I98e7687ac4055800aa46626c6b1c866e52e474df
Merged-In: I98e7687ac4055800aa46626c6b1c866e52e474df
TreeHugger Robot [Wed, 11 Jul 2018 17:36:21 +0000 (17:36 +0000)]
Merge "DO NOT MERGE HFP: Fix out of bound access in phone number processing" into nyc-dev
TreeHugger Robot [Wed, 11 Jul 2018 17:36:21 +0000 (17:36 +0000)]
Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923 am:
74de3ffb10 skipped:
2b83b53d14
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923 am:
74de3ffb10
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204
DO NOT MERGE HFP: Fix out of bound access in phone number processing
TreeHugger Robot [Wed, 11 Jul 2018 17:35:50 +0000 (17:35 +0000)]
Merge "HFP: Fix out of bound access in phone number processing" into pi-dev
Hansong Zhang [Wed, 11 Jul 2018 17:33:27 +0000 (10:33 -0700)]
Merge "HIDD: Prevent integer underflow in bta_hd_act" into oc-dev
am:
7845f60787
Change-Id: I3a100ebcb66a89ba3092c9bb3c4ff02adee3a59d
TreeHugger Robot [Wed, 11 Jul 2018 17:30:33 +0000 (17:30 +0000)]
Merge "HIDD: Prevent integer underflow in bta_hd_act" into oc-dev
Hansong Zhang [Wed, 27 Jun 2018 21:21:40 +0000 (14:21 -0700)]
HFP: Fix out of bound access in phone number processing
* Write at most sizeof(dialnum) chars into dialnum array in ClccResponse
method
* Write at most sizeof(ag_res.str) - 5 chars into ag_res.str array in
PhoneStateChange method
Bug:
79431031
Bug:
79266386
Test: make call with super long phone numbers
Change-Id: I98e7687ac4055800aa46626c6b1c866e52e474df
Ugo Yu [Mon, 9 Jul 2018 05:49:44 +0000 (13:49 +0800)]
Fix stack not acking status to audio when A2DP start failed
Add a missing ack in A2DP start failed case when A2DP offload is
enabled.
Bug:
111207927
Test: Manual
Change-Id: I96a7ad322ea7ce6da5084a48fdd3dec980ce57b8
(cherry picked from commit
0616cc7ed4cc2c76aa68639ed046f44ae891978f)
Hansong Zhang [Thu, 21 Jun 2018 23:53:41 +0000 (16:53 -0700)]
HIDD: Prevent integer underflow in bta_hd_act
Bug:
109757435
Bug:
109757168
Bug:
110846194
Bug:
109757986
Test: manual
Change-Id: I80a6f3f931ac7512f1ba801cc5d8de6ac04f3422
Pavlin Radoslavov [Fri, 29 Jun 2018 03:10:36 +0000 (20:10 -0700)]
Don't trigger AVDTP Suspend in response to AVDTP Suspend+Start from remote
If the remote device sent us AVDTP Suspend, and then AVDTP Start, don't
trigger AVDTP Suspend from the local device in response to the AVDTP Start.
Also:
* Add a call btif_av_stream_start_offload() inside btif_a2dp_on_started()
if we were started remotely.
* Fix the order of calling btif_a2dp_on_started() and triggering
an internal BTIF_AV_SUSPEND_STREAM_REQ_EVT event. Otherwise,
BTA Suspend might be called before btif_av_stream_start_offload()
Bug:
110015851
Bug:
110186160
Test: Manual
Change-Id: I908d19f8caf5130b96a64153ff39bd4b52879713
Merged-In: I908d19f8caf5130b96a64153ff39bd4b52879713
(cherry picked from commit
7e425cef6df8fc45b1aa54fb5d39d3afeb7bb369)
TreeHugger Robot [Thu, 28 Jun 2018 18:24:36 +0000 (18:24 +0000)]
Merge "A2DP Offload: Log audio duration and codec metrics" into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 18:24:34 +0000 (18:24 +0000)]
Merge "HFP: Don't use mSBC for HF devices not supporting Codec Negotiation" into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 18:24:19 +0000 (18:24 +0000)]
Merge "Multi-A2DP: Fix timing and codec measurement in metrics" into pi-dev
Android Build Merger (Role) [Thu, 28 Jun 2018 00:11:29 +0000 (00:11 +0000)]
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923 am:
74de3ffb10 skipped:
2b83b53d14
Change-Id: Ia010cee89c1922b01dd34e439830190561461bbf
Android Build Merger (Role) [Thu, 28 Jun 2018 00:11:27 +0000 (00:11 +0000)]
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923 am:
74de3ffb10
Change-Id: Idb6c305daa5fcded453a2e9f53c0bb6c6cce20a7
Android Build Merger (Role) [Thu, 28 Jun 2018 00:11:25 +0000 (00:11 +0000)]
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923
Change-Id: If5bf4635d837d15ab593d96c116489057e212710
Android Build Merger (Role) [Thu, 28 Jun 2018 00:11:23 +0000 (00:11 +0000)]
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394
Change-Id: I1a6a4a91c9f926af586675cc8f8a290f4e312945
Android Build Merger (Role) [Thu, 28 Jun 2018 00:11:12 +0000 (00:11 +0000)]
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204
Change-Id: Ie6f3408d074604cf89aa9c8dc5f63447fdba8b64
Jack He [Wed, 27 Jun 2018 00:53:24 +0000 (17:53 -0700)]
DO NOT MERGE HFP: Fix out of bound access in phone number processing
* Write at most sizeof(dialnum) chars into dialnum array in ClccResponse
method
* Write at most sizeof(ag_res.str) - 5 chars into ag_res.str array in
PhoneStateChange method
Bug:
79431031
Bug:
79266386
Test: make call with super long phone numbers
Change-Id: I98e7687ac4055800aa46626c6b1c866e52e474df
Merged-In: I98e7687ac4055800aa46626c6b1c866e52e474df
Hansong Zhang [Wed, 27 Jun 2018 22:23:07 +0000 (15:23 -0700)]
[automerger skipped] DO NOT MERGE AVRC: Copy browse.p_browse_data in btif_av_event_deep_copy am:
1d9a58768e am:
248fd6200b
am:
d2aca78317 -s ours
Change-Id: I3496b8ea2c661618d27087b94427423faa3ddd51
Hansong Zhang [Wed, 27 Jun 2018 22:19:49 +0000 (15:19 -0700)]
DO NOT MERGE AVRC: Copy browse.p_browse_data in btif_av_event_deep_copy am:
1d9a58768e
am:
248fd6200b
Change-Id: I786d844e462ea06f18083f4d47a2f6c786bfc466
Hansong Zhang [Wed, 27 Jun 2018 22:16:12 +0000 (15:16 -0700)]
DO NOT MERGE AVRC: Copy browse.p_browse_data in btif_av_event_deep_copy
am:
1d9a58768e
Change-Id: I7f9ca99de72d0e142210943163a6a3d4b1f61c1d
Jack He [Fri, 15 Jun 2018 01:04:12 +0000 (18:04 -0700)]
A2DP Offload: Log audio duration and codec metrics
* Add A2dpOffloadAudioStats class to store metrics for A2DP offload
* Add logging statements to log A2DP start/suspend/stop events when A2DP
offload is enabled
* Separate software encoding logging from hardware encoding logging
Bug:
109953464
Test: make, run A2DP in offload mode and dump metrics
Change-Id: I1a19c64c6b1ee530e5927dd3d13e31b00729850b
Merged-In: I1a19c64c6b1ee530e5927dd3d13e31b00729850b
(cherry picked from commit
dd069366fe69f2a38ef90512e7c5215e3d9d0eb2)
Jack He [Sat, 9 Jun 2018 03:13:23 +0000 (20:13 -0700)]
Multi-A2DP: Fix timing and codec measurement in metrics
* Copy BtifMediaStats and SchedulingStats when updating metrics
to avoid race conditions
* Do not log audio_duration_ms if session_end_us <= session_start_us
* Clear cached A2DP metrics when LogBluetoothSessionEnd() is called
* Log codec information along-side A2DP metrics
* Log whether A2DP offload is enabled along-side A2DP metrics
Multi-A2DP:
* Log LogBluetoothSessionStart at btif_a2dp_source_start_session_delayed
* Log LogBluetoothSessionEnd at btif_a2dp_source_end_session_delayed
Unit Test:
* Wrote A2DPSessionTwoUpdatesSeparatedbyEndTest that will fail if A2DP
metrics are not cleared when LogBluetoothSessionEnd is called
Bug:
109953464
Test: make, net_test_osi::BluetoothMetricsLoggerTest,
net_test_osi::BluetoothA2DPSessionMetricsTest
Change-Id: I6a311dce8035ce2e3f39773c260ea9eaef73e45b
Merged-In: I6a311dce8035ce2e3f39773c260ea9eaef73e45b
(cherry picked from commit
feeaf5f8cf31394d6f737543f1d0572ca91d487c)
TreeHugger Robot [Wed, 27 Jun 2018 21:02:09 +0000 (21:02 +0000)]
Merge "Add missing btif_a2dp_audio_interface_end_session() call during disconnect" into pi-dev
Pavlin Radoslavov [Thu, 21 Jun 2018 01:28:33 +0000 (18:28 -0700)]
If command_timed_out() is triggered don't get blocked by a deadlock
If command_timed_out() is triggered and we cannot acquire the
commands_pending_response_mutex to print the debug info, then proceed
with the rest of the operations until the process aborts.
Similarly, if startup_timer_expired() is triggered and we are blocked
by a deadlock, just abort() because there is no way to recover.
Bug:
110441099
Test: Code compilation
Change-Id: I367332bbbd9c1d887bd2bc829b9f617114fc96fc
Merged-In: I367332bbbd9c1d887bd2bc829b9f617114fc96fc
(cherry picked from commit
2838b32ce424a6f8c8025175aaf9b6fd8cab313f)
Pavlin Radoslavov [Mon, 25 Jun 2018 23:34:17 +0000 (16:34 -0700)]
Add missing btif_a2dp_audio_interface_end_session() call during disconnect
Update the logic inside btif_a2dp_source_end_session_delayed() to make
sure that btif_a2dp_audio_interface_end_session() is called when device
is disconnected.
Also, update existing log messages to make it easier to identify similar
issues in the future.
Bug:
110176990
Test: Manual: Pair with two headsets, start/suspend/stop/switch active
device
Change-Id: I248e5c3e2c4cf0ad820cef34ba859e9adc8dec8e
Merged-In: I248e5c3e2c4cf0ad820cef34ba859e9adc8dec8e
(cherry picked from commit
f40b85b46c873530f4e6c01c81be8e3b0ff486db)
Pavlin Radoslavov [Wed, 20 Jun 2018 02:10:43 +0000 (19:10 -0700)]
Gracefully handle A2DP hardware offload Audio HAL service death
Register for Audio HAL service death, and restart the Audio HAL session
if necessary.
Bug:
77926419
Test: Manual: stream Bluetooth audio and kill -9 the audioserver
Change-Id: I45e83aea0fb95301e6ceadee74661dd55f8c0f66
Merged-In: I45e83aea0fb95301e6ceadee74661dd55f8c0f66
(cherry picked from commit
5c80c8653a61780f8047413d5ad9f939a8a397f3)
weichinweng [Thu, 21 Jun 2018 06:28:25 +0000 (14:28 +0800)]
HFP: Don't use mSBC for HF devices not supporting Codec Negotiation
* Some misbehaving HF devices (e.g. Sony XAV AX100 carkit, Sony MW600)
indicate their support on WBS but not support on Codec Negotiation.
In this condition, if Fluoride chooses mSBC will result in big noise or SCO
no sound.
* This CL adds a workaround for checking if HF device indicate codec negotiation is
not supported, Fluoride will assume CVSD codec by default.
Bug:
101592600
Test: make, connect SCO and check voice on carkit and headset.
Change-Id: If0d8779bcfd55b87852f56f0448fd1b585ee45ad
(cherry picked from commit
e4b9dead3c6be05f111fb710f9e4d7c436b65ed4)
Pavlin Radoslavov [Thu, 14 Jun 2018 23:27:54 +0000 (16:27 -0700)]
Correctly initialize A2DP Sink codecs if A2DP Source HW offload is enabled
This also fixes unit test failures if A2DP Source HW offload is enabled.
Bug:
110228602
Test: Failing unit tests now succeed
Change-Id: I36678738bfcfcce0f2e8a055f10c86cc6b3e682a
Merged-In: I36678738bfcfcce0f2e8a055f10c86cc6b3e682a
(cherry picked from commit
af66441fecd1b56c26d5c25866d6fc7677ec0c2a)
cheneyni [Mon, 11 Jun 2018 13:19:26 +0000 (21:19 +0800)]
Clear local suspending flag when the BTA_AV_STOP_EVT event received
The Stack would set the pending flag when received the Stop request but
did not clear it even state became Opened. This would cuase Stack
replied Suspended immediately to Audio HAL but kept peer at Started
state and failed to handle Start request again.
This change clears the local suspending flag when BTA_AV_STOP_EVT
received and also reset all pending status when becomes Opened so it
will take effect only when Stack is changing state from Started.
Bug:
110022304
Test: Manual: (1) Play A2DP music and switch codec
(2) Play A2DP music and change active device
Change-Id: I4b9aca33eb7eb6c40038e2082d23eb22e5830714
Merged-In: I4b9aca33eb7eb6c40038e2082d23eb22e5830714
(cherry picked from commit
e643d30249256461fd1c0a132b48c65e2eac18ba)
Hansong Zhang [Thu, 14 Jun 2018 00:33:23 +0000 (17:33 -0700)]
DO NOT MERGE AVRC: Copy browse.p_browse_data in btif_av_event_deep_copy
p_msg_src->browse.p_browse_data is not copied, but used after the
original pointer is freed
Bug:
109699112
Test: manual
Change-Id: I1d014eb9a8911da6913173a9b11218bf1c89e16e
TreeHugger Robot [Thu, 7 Jun 2018 15:08:47 +0000 (15:08 +0000)]
Merge "Don't reuse buffer when building response" into pi-dev
Ajay Panicker [Thu, 7 Jun 2018 05:28:11 +0000 (22:28 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev am:
0cda123801 am:
427aebe54a
am:
20b2bc080e
Change-Id: I3662266f41058a194921afe9126dfbbd0b9c8b52
Ajay Panicker [Thu, 7 Jun 2018 05:26:17 +0000 (22:26 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev am:
086995d099 am:
352b01c987
am:
728f645ccc
Change-Id: I1e3070df2626d5c92f0afe4654da67eb107fee85
Ajay Panicker [Thu, 7 Jun 2018 05:25:47 +0000 (22:25 -0700)]
[automerger skipped] DO NOT MERGE: Don't reuse buffer when building response am:
9bbce86038 am:
2e3d8cde0e
am:
34d0e93bc6 -s ours
Change-Id: I573567707397a1aa0cb69a683156c1a5b76b7bd0
TreeHugger Robot [Thu, 7 Jun 2018 05:25:08 +0000 (05:25 +0000)]
Merge "Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming" into pi-dev
Ajay Panicker [Thu, 7 Jun 2018 04:21:58 +0000 (21:21 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev am:
0cda123801
am:
427aebe54a
Change-Id: I7d0fb74f7c6f45411f72c0471a239f933e3fc101
Ajay Panicker [Thu, 7 Jun 2018 04:21:32 +0000 (21:21 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev am:
086995d099
am:
352b01c987
Change-Id: I1753fa0854933bf75a4d8c763d2be1d29fa398af
Ajay Panicker [Thu, 7 Jun 2018 04:20:59 +0000 (21:20 -0700)]
DO NOT MERGE: Don't reuse buffer when building response am:
9bbce86038
am:
2e3d8cde0e
Change-Id: I3a59bf8a5c375be0388952a1232316bf88ae0928
Ajay Panicker [Thu, 7 Jun 2018 03:08:39 +0000 (20:08 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev
am:
0cda123801
Change-Id: I439feb0e5a5ee9dc65613aab59f48f98405ac1c5
Ajay Panicker [Thu, 7 Jun 2018 03:08:06 +0000 (20:08 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev
am:
086995d099
Change-Id: I8ba858a9bfdc2d81c487692cda8bb16e9b371356
Ajay Panicker [Thu, 7 Jun 2018 03:07:30 +0000 (20:07 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
am:
9bbce86038
Change-Id: I0b7edc528c15d05e2b07c2ad5b30c40a387eb87f
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: Don't reuse buffer when building response" into nyc-dev
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0 skipped:
052add83b4
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
TreeHugger Robot [Thu, 7 Jun 2018 01:53:53 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
TreeHugger Robot [Thu, 7 Jun 2018 01:36:28 +0000 (01:36 +0000)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30 am:
5d335dfb7b skipped:
66c6a114a6
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30 am:
5d335dfb7b
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8
DO NOT MERGE: Don't reuse buffer when building response
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:48 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0 skipped:
052add83b4
Change-Id: Id3ae5582793f9deabc23e530380f0aa565b64b8e
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:46 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0
Change-Id: I39f72d38038768d9207455399184cccde2ccba4b
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:44 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
Change-Id: Ib332da78669cd9e8b6c1d3f25d54cc8df23b444a
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:41 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
Change-Id: Idf12259570aae1cf15a4f4805df093a8d0dabf43
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:38 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
Change-Id: I4911528515373e3dfc0763d5f793df29fb64d4e8
Ajay Panicker [Wed, 6 Jun 2018 21:58:54 +0000 (14:58 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I5e059615db589e165630f39d631a922006c2d70f
Android Build Merger (Role) [Thu, 7 Jun 2018 00:44:15 +0000 (00:44 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30 am:
5d335dfb7b skipped:
66c6a114a6
Change-Id: I1c26c4fed03c9e6b6e0ae80ab330eb15dfee9072
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:57 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30 am:
5d335dfb7b
Change-Id: I1cd26eb9ac7ddcb7797b8011119156403c7920fb
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:34 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30
Change-Id: Ic43b38cb648059daff18c044d45d154b1700a632
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:27 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930
Change-Id: Ic705adf4e25e1fb686feaa2894a37cda250fa9c0
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:25 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98
Change-Id: Ifbff9c61654090104521be186d0bce9a3ae337a8
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:23 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d
Change-Id: I5d7ceaba658d90e8a8931b50a6c8774f2c690b5d
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:21 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d
Change-Id: I9d251934afe063299b4b7f36ea63c214b5188577
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:20 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351
Change-Id: I7b8076d21aeeb80c469764d0643ee54e9de049ff
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:18 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8
Change-Id: I73fc976256c6af11d7431778b3c962a2816f5f5f
Ajay Panicker [Wed, 6 Jun 2018 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I2c00660bb551bbac58df88d2df07c98a30871e58
Ajay Panicker [Tue, 5 Jun 2018 23:08:06 +0000 (16:08 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I2d808f941d3c71fcb6306c733717624be10478e0
Ajay Panicker [Tue, 5 Jun 2018 23:08:06 +0000 (16:08 -0700)]
Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I2d808f941d3c71fcb6306c733717624be10478e0
Ajay Panicker [Thu, 31 May 2018 00:50:39 +0000 (17:50 -0700)]
Run the AVRCP Service interface functions on the BTA thread
Bug:
80416347
Test: Turn off Bluetooth while connected to a device we initiated the
connection to.
Change-Id: I8f10409c495213ef3117aedf66919de7c0b3d164
Pavlin Radoslavov [Tue, 5 Jun 2018 05:18:32 +0000 (22:18 -0700)]
Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming
The A2DP_CTRL_CMD_SUSPEND command from the Audio HAL could be received
even if audio wasn't streaming before. Therefore, we should always
respond with an ACK once the command processing has been completed.
Bug:
109712592
Test: Manual: (1) Play music to Headset; (2) Select "This device" as output;
(3) Stop playing music; (4) Select Headset as output
Change-Id: I0f5d52d14b50882931b9d19de1a2f25204fce19e
Pavlin Radoslavov [Tue, 5 Jun 2018 07:49:47 +0000 (00:49 -0700)]
[automerger skipped] [automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b am:
e7c8891319 am:
c25b7e056e am:
515cf6983e am:
8dca5d6981 skipped:
25fc5872de am:
d25b494ad6 -s ours am:
5b62b582dc -s ours
am:
2c9e2b2869 -s ours
Change-Id: I85d8fcf81ab3582373d2ac0f4b849fccb1ea6918
Pavlin Radoslavov [Tue, 5 Jun 2018 07:45:38 +0000 (00:45 -0700)]
[automerger skipped] [automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b am:
e7c8891319 am:
c25b7e056e am:
515cf6983e am:
8dca5d6981 skipped:
25fc5872de am:
d25b494ad6 -s ours
am:
5b62b582dc -s ours
Change-Id: I366348476e217dbc3ccfd43611e6e2ca57bfda4c
Pavlin Radoslavov [Tue, 5 Jun 2018 07:41:38 +0000 (00:41 -0700)]
[automerger skipped] [automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b am:
e7c8891319 am:
c25b7e056e am:
515cf6983e am:
8dca5d6981 skipped:
25fc5872de
am:
d25b494ad6 -s ours
Change-Id: I73dc4042b7c4283bcca582638079c0fc4bab161c
Android Build Merger (Role) [Tue, 5 Jun 2018 03:50:22 +0000 (03:50 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b am:
e7c8891319 am:
c25b7e056e am:
515cf6983e am:
8dca5d6981 skipped:
25fc5872de
Change-Id: Ic7d6036bf7b14dbc1979990181612dc8c0c35e71