OSDN Git Service
TreeHugger Robot [Thu, 26 Mar 2020 20:03:24 +0000 (20:03 +0000)]
[automerger skipped] Merge "DO NOT MERGE Ensure hci command status event has sufficient packet length" into qt-qpr1-dev am:
466138189c -s ours am:
7eefb5094e
Change-Id: Ia9aa4011fbd88bcd013d167d26485ce256279010
TreeHugger Robot [Thu, 26 Mar 2020 19:43:52 +0000 (19:43 +0000)]
[automerger skipped] Merge "DO NOT MERGE Ensure hci command status event has sufficient packet length" into qt-qpr1-dev am:
466138189c -s ours
am skip reason: subject contains skip directive
Change-Id: I3e56d0584e861ec214834a7568cf48c8b2d65f19
TreeHugger Robot [Thu, 26 Mar 2020 19:27:55 +0000 (19:27 +0000)]
Merge "DO NOT MERGE Ensure hci command status event has sufficient packet length" into qt-qpr1-dev
Cheney Ni [Wed, 25 Mar 2020 15:51:06 +0000 (15:51 +0000)]
A2DP: Remember every peer's AVDTP delay reporting am:
c12dc4d9e0
Change-Id: I56006c33aa266418598c0eb6180f3477b520677f
Cheney Ni [Mon, 23 Mar 2020 14:40:39 +0000 (22:40 +0800)]
A2DP: Remember every peer's AVDTP delay reporting
Almost every headset has its own delay reporting. This change remembers
those particular values individually, and applies when the peer is the
active device.
Bug:
152276107
Test: manually
Change-Id: I634dfd18a034fe4020f48139d7e0f14a1309098a
Merged-In: I634dfd18a034fe4020f48139d7e0f14a1309098a
(cherry picked from commit
0bf47fa2cf71188728aac2d232e2f02e8661d92c)
Chen Chen [Wed, 25 Mar 2020 00:12:55 +0000 (00:12 +0000)]
BluetoothMetrics: Return true if SaveDevice is called twice. Add more am:
8b185ac050
Change-Id: I2ab5dc860a9a4e099a730ed945a051a24ec9a2cd
Chen Chen [Tue, 24 Mar 2020 21:52:52 +0000 (14:52 -0700)]
BluetoothMetrics: Return true if SaveDevice is called twice. Add more
logging
Test: atest BluetoothMetricIdAllocatorTest
Bug:
152251473
Change-Id: I3d5ee8d086a4e589e84a766d3d0923d3ae2278ba
TreeHugger Robot [Mon, 23 Mar 2020 06:19:01 +0000 (06:19 +0000)]
[automerger skipped] Merge "AVDTP: Prevent OOB read when parsing rejected response" into qt-qpr1-dev am:
f021675ca6 -s ours am:
61c03eb553 -s ours
am skip reason: Change-Id Iddb887c79bd8a2caa2ae5f21af15219807f9dd63 with SHA-1
c49665a9f9 is in history
Change-Id: I4e8cb89ae72f0020939d337b1ea96122e2289448
TreeHugger Robot [Mon, 23 Mar 2020 05:53:51 +0000 (05:53 +0000)]
[automerger skipped] Merge "AVDTP: Prevent OOB read when parsing rejected response" into qt-qpr1-dev am:
f021675ca6 -s ours
am skip reason: Change-Id Iddb887c79bd8a2caa2ae5f21af15219807f9dd63 with SHA-1
c49665a9f9 is in history
Change-Id: I68f5adcc7dc7f005c3d484ae68472635cbda02b1
TreeHugger Robot [Mon, 23 Mar 2020 05:36:25 +0000 (05:36 +0000)]
Merge "AVDTP: Prevent OOB read when parsing rejected response" into qt-qpr1-dev
Rahul Sabnis [Sat, 21 Mar 2020 07:02:43 +0000 (07:02 +0000)]
Re-add binder method for getPriority in IBluetoothA2dp.aidl as well as am:
d0ff7d0e22
Change-Id: Id99260f4beb96e69e750fc599a0d296d4bdf7685
Rahul Sabnis [Fri, 20 Mar 2020 02:40:40 +0000 (19:40 -0700)]
Re-add binder method for getPriority in IBluetoothA2dp.aidl as well as
getPriority and setPriority in IBluetoothHeadset.aidl
Bug:
148689314
Test: Manual
Change-Id: Id9efe237b24dbf24e91491826d34f61cbb761991
Chen Chen [Fri, 20 Mar 2020 20:46:18 +0000 (20:46 +0000)]
Bluetooth Metrics: Init and Close MetricIdAllocator and use its APIs am:
4c23956486
Change-Id: I2c525e6942eb4ecfceb6c03f8dd33c3f84584d23
Chen Chen [Sat, 14 Mar 2020 00:00:24 +0000 (17:00 -0700)]
Bluetooth Metrics: Init and Close MetricIdAllocator and use its APIs
Test: Manually pair device and cat config file
Bug:
142563377
Change-Id: I4492dc9b4c9d810e7919e97ef36ea151b76b2dbc
Merged-In: I4492dc9b4c9d810e7919e97ef36ea151b76b2dbc
(cherry picked from commit
f6a356ead8e711e3b94e0e915a5b94cfac978ffa)
Joseph Pirozzo [Fri, 20 Mar 2020 17:45:23 +0000 (17:45 +0000)]
[automerger skipped] Merge changes I685873b0,Iac3078fa into qt-qpr1-dev am:
2c4f9ef514 -s ours am:
960d4a9f0b -s ours
am skip reason: Change-Id I685873b0c4c74ddb4e273e2a38307ec2af0bbd13 with SHA-1
daa34793f2 is in history
Change-Id: Ie2864e9d046754b6c90e5e8f5d75e1a1a5801e3a
Joseph Pirozzo [Fri, 20 Mar 2020 17:28:47 +0000 (17:28 +0000)]
[automerger skipped] Merge changes I685873b0,Iac3078fa into qt-qpr1-dev am:
2c4f9ef514 -s ours
am skip reason: Change-Id I685873b0c4c74ddb4e273e2a38307ec2af0bbd13 with SHA-1
daa34793f2 is in history
Change-Id: Ia10cdd7d6309e64bae3d59de1a77620eccb6d86e
Joseph Pirozzo [Fri, 20 Mar 2020 17:19:37 +0000 (17:19 +0000)]
Merge changes I685873b0,Iac3078fa into qt-qpr1-dev
* changes:
HF_Client: Send BTA_HF_CLIENT_RFC_CLOSE_EVT when client_cb == NULL
HF_Client: Free the RFC if the handle doesn't match
TreeHugger Robot [Fri, 20 Mar 2020 04:02:03 +0000 (04:02 +0000)]
[automerger skipped] Merge "Fix bluetooth can't turn off during network reset (3/3)" into qt-qpr1-dev am:
60af186b8e -s ours am:
e57428ba69 -s ours
am skip reason: Change-Id Ic36ffd63c376f84e3c9f0388820da86f63465c8f with SHA-1
9adf47f6c8 is in history
Change-Id: If4f1fee702a7d5830c8e1e520ba78ffe4d5f8ae0
TreeHugger Robot [Fri, 20 Mar 2020 04:01:53 +0000 (04:01 +0000)]
Merge "avrc: Validating msg size before accessing fields" into qt-qpr1-dev am:
49437a62bd am:
4230b134a3
Change-Id: I30a22eb3b5246254aa50a864f7e6f9b2d6e8cd7c
TreeHugger Robot [Fri, 20 Mar 2020 03:44:15 +0000 (03:44 +0000)]
[automerger skipped] Merge "Fix bluetooth can't turn off during network reset (3/3)" into qt-qpr1-dev am:
60af186b8e -s ours
am skip reason: Change-Id Ic36ffd63c376f84e3c9f0388820da86f63465c8f with SHA-1
9adf47f6c8 is in history
Change-Id: I20a62a958b5d6ce65712af48eb31fe7d0bf489c3
TreeHugger Robot [Fri, 20 Mar 2020 03:43:16 +0000 (03:43 +0000)]
Merge "avrc: Validating msg size before accessing fields" into qt-qpr1-dev am:
49437a62bd
Change-Id: I6ff012808218c6026584d4dc9217b99d8c6a3169
TreeHugger Robot [Fri, 20 Mar 2020 03:33:52 +0000 (03:33 +0000)]
Merge "Fix bluetooth can't turn off during network reset (3/3)" into qt-qpr1-dev
TreeHugger Robot [Fri, 20 Mar 2020 03:29:10 +0000 (03:29 +0000)]
Merge "avrc: Validating msg size before accessing fields" into qt-qpr1-dev
TreeHugger Robot [Fri, 20 Mar 2020 03:19:05 +0000 (03:19 +0000)]
Merge "Fix potential OOB vulnerability when an HCI event is received" into rvc-dev am:
aca4c75e63
Change-Id: I00f9ef278b27fb7800d017044c5ad9d881a6c757
TreeHugger Robot [Fri, 20 Mar 2020 03:03:23 +0000 (03:03 +0000)]
Merge "Fix potential OOB vulnerability when an HCI event is received" into rvc-dev
Joseph Pirozzo [Thu, 19 Mar 2020 18:18:47 +0000 (18:18 +0000)]
[automerger skipped] Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-dev am:
b204c00caa -s ours am:
c5487c058a -s ours
am skip reason: Change-Id If5802418f6069dbc72824745307342776175d9d8 with SHA-1
7661c2a8b9 is in history
Change-Id: I230f2a77a12ee7b61346894ad8548e81a9f2d628
Joseph Pirozzo [Thu, 19 Mar 2020 18:06:19 +0000 (18:06 +0000)]
[automerger skipped] Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-dev am:
b204c00caa -s ours
am skip reason: Change-Id If5802418f6069dbc72824745307342776175d9d8 with SHA-1
7661c2a8b9 is in history
Change-Id: I0c194570d0c8e3049a2c550f69c45865e033789c
Joseph Pirozzo [Thu, 19 Mar 2020 17:54:22 +0000 (17:54 +0000)]
Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-dev
* changes:
AVRCP Controller manage focus while disconnected
AVRCP Controller refresh track data on Interim
AVRCP Controller get play status
ServiceDiscoveryProtocol DB Full
AVRCP Position Changed Notification
DO NOT MERGE: AVRCP Controller Shuffle/Repeat support
jonerlin [Mon, 2 Mar 2020 11:13:31 +0000 (19:13 +0800)]
Fix potential OOB vulnerability when an HCI event is received
* Check the minimum length of Hci Events to avoid OOB vulnerability
Bug:
142546104
Bug:
142546561
Bug:
142544089
Bug:
142638492
Bug:
142638392
Bug:
142544079
Bug:
142543497
Test: inject function, Bluetooth regression test PASS.
Change-Id: I761fc56dae45bd1fe24e55669adf6a9965717830
Jakub Pawlowski [Thu, 19 Mar 2020 10:44:45 +0000 (10:44 +0000)]
Merge "Randomize the time between rotations of BLE Random Address" into rvc-dev am:
2dcb0c2d59
Change-Id: I6b5e18f946bd2ce733b3030e62c73150a6f0f7ba
Jakub Pawlowski [Thu, 19 Mar 2020 10:19:13 +0000 (10:19 +0000)]
Merge "Randomize the time between rotations of BLE Random Address" into rvc-dev
More Kuo [Thu, 19 Mar 2020 02:52:06 +0000 (02:52 +0000)]
Merge "Notify remote name failed for LE device" into qt-qpr1-dev am:
fba6af3495 am:
2d2c3500dd
Change-Id: I35491a414ed91c130cfcf8c220df235663d6f7dd
More Kuo [Thu, 19 Mar 2020 02:28:43 +0000 (02:28 +0000)]
Merge "Notify remote name failed for LE device" into qt-qpr1-dev am:
fba6af3495
Change-Id: I3f70c6d6f3c8ddace2b0e3dda47a09409d0313eb
More Kuo [Thu, 19 Mar 2020 02:05:39 +0000 (02:05 +0000)]
Merge "Notify remote name failed for LE device" into qt-qpr1-dev
TreeHugger Robot [Wed, 18 Mar 2020 23:26:41 +0000 (23:26 +0000)]
Merge "Make sure only valid packet fields are accessed in VendorPacketHandler" into qt-qpr1-dev am:
0535ce8c6a am:
a411a5d9e1
Change-Id: I929a9795cc8129183d6d5342d8f9e716a4248509
TreeHugger Robot [Wed, 18 Mar 2020 23:05:17 +0000 (23:05 +0000)]
Merge "Make sure only valid packet fields are accessed in VendorPacketHandler" into qt-qpr1-dev am:
0535ce8c6a
Change-Id: Ib85f65466fd49c6290e2ed395ea56f63827d953b
TreeHugger Robot [Wed, 18 Mar 2020 22:52:14 +0000 (22:52 +0000)]
Merge "Make sure only valid packet fields are accessed in VendorPacketHandler" into qt-qpr1-dev
Jakub Pawlowski [Tue, 17 Mar 2020 15:37:36 +0000 (16:37 +0100)]
Randomize the time between rotations of BLE Random Address
Bug:
150394435
Bug:
151485516
Change-Id: I342f3e34f12a200db0a5c3aab23efabac5626825
Song Gao [Thu, 12 Dec 2019 18:32:27 +0000 (10:32 -0800)]
HF_Client: Send BTA_HF_CLIENT_RFC_CLOSE_EVT when client_cb == NULL
Bug:
146086992
Test: manual
Change-Id: I685873b0c4c74ddb4e273e2a38307ec2af0bbd13
Merged-In: I685873b0c4c74ddb4e273e2a38307ec2af0bbd13
(cherry picked from commit
daa34793f2e076be3bf600e079128754a0cb8576)
Song Gao [Thu, 12 Dec 2019 18:28:36 +0000 (10:28 -0800)]
HF_Client: Free the RFC if the handle doesn't match
Bug:
146086995
Test: manual
Change-Id: Iac3078fa2d10373f295fe9c6fd49ddc39f15eb98
Merged-In: Iac3078fa2d10373f295fe9c6fd49ddc39f15eb98
(cherry picked from commit
8da3a9ed0886821be7fb4a9fa71abbb112e7a95f)
Automerger Merge Worker [Mon, 16 Mar 2020 16:40:00 +0000 (16:40 +0000)]
Merge "DO NOT MERGE Fix potential overflow for gatt process write" into rvc-dev am:
686a63f483
Change-Id: I31780c980932a198c7b215b0fbb3f79a5fc186f0
Automerger Merge Worker [Mon, 16 Mar 2020 16:39:59 +0000 (16:39 +0000)]
DO NOT MERGE Fix potential overflow for gatt process write am:
a6fcdfabeb
Change-Id: I093aa39a96b03f4905f852555950466f74aa3b9b
Automerger Merge Worker [Mon, 16 Mar 2020 16:39:43 +0000 (16:39 +0000)]
Fix bond list mismatch between Java and native am:
8ffea167cb
Change-Id: I979372e34a3f3f80fa2c56f5c89a3ed3c9325813
TreeHugger Robot [Mon, 16 Mar 2020 16:25:40 +0000 (16:25 +0000)]
Merge "DO NOT MERGE Fix potential overflow for gatt process write" into rvc-dev
Ugo Yu [Mon, 9 Mar 2020 06:54:14 +0000 (14:54 +0800)]
Fix bond list mismatch between Java and native
When a paired device is diconnected while authenticating, do not report
bond state change to Java since the stack does not remove the device in
this situation.
Bug:
142842685
Test: Manual
Change-Id: I308320b0c10387d1cce27f709c8b2348c14dc423
Merged-In: I308320b0c10387d1cce27f709c8b2348c14dc423
More Kuo [Fri, 13 Mar 2020 06:43:29 +0000 (14:43 +0800)]
Notify remote name failed for LE device
When cancel discovery for LE device in BTA_DM_DISCOVER_ACTIVE state,
there is no notification to indicate the remote name request of LE
device is cancelled and change the search state back to
BTA_DM_SEARCH_IDLE state. Call btm_inq_rmt_name_failed_cancelled()
to notify in this situation.
Bug:
146840780
Test: Manual
Change-Id: I4ab2a2f413e4ac19765476039f4127ce045e84d9
Chris Manton [Tue, 3 Mar 2020 18:33:42 +0000 (10:33 -0800)]
DO NOT MERGE Ensure hci command status event has sufficient packet length
Bug:
141618611
Test: net_test_hci_native
Change-Id: I70a318b05d7781ddf8f82d7922a8ee7afc8d2e9f
(cherry picked from commit
6e25c5d81c4a43c2794a605c9fc8a194f37889af)
Chris Manton [Wed, 4 Mar 2020 19:26:31 +0000 (11:26 -0800)]
DO NOT MERGE Fix potential overflow for gatt process write
Bug:
143604331
Test: net_test_stack_gatt_native
Change-Id: I88704d74ba0c265872fbfd20c8bcd3bc1dd60360
(cherry picked from commit
af0919f967eef7fffaf698fa0a30f0efe7d941b5)
Automerger Merge Worker [Fri, 13 Mar 2020 20:02:18 +0000 (20:02 +0000)]
Save reversed BR/EDR link key derived from LE LTK am:
0f13f7c4ca
Change-Id: I7ad0c1f19ae3a63ec42576450346beb616904063
Joseph Pirozzo [Mon, 18 Nov 2019 19:44:37 +0000 (11:44 -0800)]
AVRCP Controller manage focus while disconnected
If Audio focus is lost(or gained) while A2DP is not connected there is the
possibility for states to get out of sync. Removing the check for
connectivity ensures that the state can be properly managed.
Bug:
144082798
Test: Disconnect BT device, lose audio focus, verify
btif_a2dp_sink_set_focus_state_event state gets updated.
Change-Id: If5802418f6069dbc72824745307342776175d9d8
(cherry picked from commit
7661c2a8b90bee7edcf7c1279abe06ed32e22a2c)
Change-Id: I22a7ee2a3e51c3dea441a6f185e1c993cd65c4a1
Merged-In: If5802418f6069dbc72824745307342776175d9d8
Joseph Pirozzo [Thu, 14 Nov 2019 00:02:06 +0000 (16:02 -0800)]
AVRCP Controller refresh track data on Interim
Upon receiving an interim track changed event fetch the now playing
track information. Resolves issues where track changes get out of sync.
Bug:
143954201
Test: connect a phone and change tracks rapidly on phone.
Change-Id: I1e4ce62df6839dd2b9cf40832556a9b2608593e7
(cherry picked from commit
a3d62166f685f5249b813bd110e894682c84da54)
Change-Id: Ia6cc2a7a0430d6d9e3ae6e911e3fc8834221b599
Merged-In: I1e4ce62df6839dd2b9cf40832556a9b2608593e7
Joseph Pirozzo [Mon, 21 Oct 2019 22:39:09 +0000 (15:39 -0700)]
AVRCP Controller get play status
Correct the parsing error in the GET_PLAY_STATUS message and call the
proper jni callback when it is received.
Bug:
139033614
Test: Connect AVRCP change media players, observe correct value parsed.
Change-Id: I8302b64efdd72bfa671cca5b8c512a436fa54ab3
(cherry picked from commit
86b473cae724e9db2efec9ed1ee50a71f2a2dd22)
Merged-In:
86b473cae724e9db2efec9ed1ee50a71f2a2dd22
Change-Id: I0c753fbc7bb62698cf23b9ded13497b6b60cda35
Merged-In: I8302b64efdd72bfa671cca5b8c512a436fa54ab3
Joseph Pirozzo [Tue, 1 Oct 2019 21:13:29 +0000 (14:13 -0700)]
ServiceDiscoveryProtocol DB Full
Increase the size of the local SDP DB to cope with newer phones supporting
more Bluetooth profiles.
Bug:
141889288
Test: pair Bluetooth device verify no warning "SDP - DB full add_attr"
Change-Id: I823ea6e178f098a0441efde4fb7d8e7fb68e38c0
(cherry picked from commit
e62a51a4d6a25de3629194bad7d1d42b739e231f)
Change-Id: I06259aa3aa9b1d034b8b60dd9dcbfffe0080bacc
Merged-In: I823ea6e178f098a0441efde4fb7d8e7fb68e38c0
Joseph Pirozzo [Fri, 28 Jun 2019 18:07:52 +0000 (11:07 -0700)]
AVRCP Position Changed Notification
Correct position change notification to be received every 2000 ms
instead of every 2000 s.
Bug:
133400561
Test: Connect to device and monitor avrcp traffic.
Change-Id: Id8a33670b207f4a9ac03da957075acbac0c7c052
(cherry picked from commit
f11c6baecf498b2f407c545ab8d9dcc34cc62c4d)
Change-Id: If5324d4ef5fe20c71c7b603d648fff82b81ce550
Merged-In: Id8a33670b207f4a9ac03da957075acbac0c7c052
Joseph Pirozzo [Fri, 26 Jul 2019 19:26:01 +0000 (12:26 -0700)]
DO NOT MERGE: AVRCP Controller Shuffle/Repeat support
Fetch player settings when the addressed player changes.
Bug:
72495707
Test: AvrcpControllerStateMachineTest#testShuffle
AvrcpControllerStateMachineTest#testRepeat
Change-Id: I4df1f130dafb96708ec7a0a2c13c776affcc6318
(cherry picked from commit
60a193dfeb155aeb8428fb341737b385f8260899)
Change-Id: I944419ad0bd5e49bad8a988851c1a753c0753d01
Merged-In: I4df1f130dafb96708ec7a0a2c13c776affcc6318
IHLHO KIM [Tue, 5 Nov 2019 08:56:24 +0000 (08:56 +0000)]
Save reversed BR/EDR link key derived from LE LTK
Authentication is failed between Android Q and Android P or earlier when derived link key is used.
Repro steps:
1. Try to LE connect & pair(LE secure connection) with Android P device from Android Q device
2. Try to connect PAN from Android Q device to Android P device
3. Connection failed
This issue is caused by the following change.
https://android.googlesource.com/platform/system/bt/+/
ae57211e7c6ef25788369052817403e30cc9f06f
This fix just reverts removed line from the previous change.
Bug:
143940249
Change-Id: I5d18cdd76b6c436dad010caf514ab0d78997f091
Automerger Merge Worker [Fri, 13 Mar 2020 04:54:49 +0000 (04:54 +0000)]
[automerger skipped] Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" into qt-qpr1-dev am:
5e6231c7b2 -s ours am:
145941ff2f -s ours
am skip reason: Change-Id I75f39801e9779ee55fa574e30051e01966c61ea3 with SHA-1
ba432366f9 is in history
Change-Id: I7a0f8d891096ea794775ebc9aaf860d0badf7acb
Automerger Merge Worker [Fri, 13 Mar 2020 04:37:20 +0000 (04:37 +0000)]
[automerger skipped] Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" into qt-qpr1-dev am:
5e6231c7b2 -s ours
am skip reason: Change-Id I75f39801e9779ee55fa574e30051e01966c61ea3 with SHA-1
ba432366f9 is in history
Change-Id: I182a3d57dca6c055487dc1cbd659e53eaab0f111
TreeHugger Robot [Fri, 13 Mar 2020 04:21:17 +0000 (04:21 +0000)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" into qt-qpr1-dev
Automerger Merge Worker [Fri, 13 Mar 2020 01:27:24 +0000 (01:27 +0000)]
HFP: fix collision for the outgoing and incoming connection am:
0f12c08a5f
Change-Id: Ie4cd0314547ce495b0c3aafa52d2a2520307f487
weichinweng [Wed, 11 Mar 2020 06:51:27 +0000 (14:51 +0800)]
HFP: fix collision for the outgoing and incoming connection
Since the HF incoming connection and the HF outgoing connection use the
same HF control block (p_scb) at the same time, the case will cause the
btif_hf_cb flag going wrong due to collision. Then it will trigger a
crash due to a check failure when executing BTA_AG_OPEN_EVT. The patch
will ignore the outgoing connection when the connection
collision is happening.
Bug:
143128949
Test: manual
Change-Id: Id5495bd3ecb1ed9e03de5bd74a61ab102604eaae
Merged-In: Id5495bd3ecb1ed9e03de5bd74a61ab102604eaae
Automerger Merge Worker [Thu, 12 Mar 2020 02:35:56 +0000 (02:35 +0000)]
Merge "DO NOT MERGE Fix potential overflow in btif_rc" into rvc-dev am:
f465348c7a
Change-Id: I3706d649e70469ecf377c03f9b7717c7fce27f51
Automerger Merge Worker [Thu, 12 Mar 2020 02:35:52 +0000 (02:35 +0000)]
DO NOT MERGE Fix potential overflow in btif_rc am:
f6c68880db
Change-Id: Id1732868d66e0e82dc608b6c5aab12ef45096964
TreeHugger Robot [Thu, 12 Mar 2020 02:20:30 +0000 (02:20 +0000)]
Merge "DO NOT MERGE Fix potential overflow in btif_rc" into rvc-dev
Automerger Merge Worker [Thu, 12 Mar 2020 00:39:52 +0000 (00:39 +0000)]
Merge "BluetoothMetricid: Add metric allocator api in java" into rvc-dev am:
6e9859c781
Change-Id: Ie9e14f68a7982c3d036aa905f19217bc2482bb88
TreeHugger Robot [Thu, 12 Mar 2020 00:27:39 +0000 (00:27 +0000)]
Merge "BluetoothMetricid: Add metric allocator api in java" into rvc-dev
Chris Manton [Wed, 4 Mar 2020 04:04:51 +0000 (20:04 -0800)]
DO NOT MERGE Fix potential overflow in btif_rc
Bug:
142878416
Test: net_test_btif_rc
Change-Id: Ia263bd5c863644f2adde759a103d79b812a9a5de
(cherry picked from commit
e5dd9c735a30188286c7c9b88c247e4f629bdd54)
Automerger Merge Worker [Wed, 11 Mar 2020 23:54:29 +0000 (23:54 +0000)]
DO NOT MERGE Ensure hci command status event has sufficient packet length am:
d3d77547e4
Change-Id: Ie584f41ed896e12b148c5a84d9e09ddb8753d327
Chris Manton [Tue, 3 Mar 2020 18:33:42 +0000 (10:33 -0800)]
DO NOT MERGE Ensure hci command status event has sufficient packet length
Bug:
141618611
Test: net_test_hci_native
Change-Id: I70a318b05d7781ddf8f82d7922a8ee7afc8d2e9f
(cherry picked from commit
6e25c5d81c4a43c2794a605c9fc8a194f37889af)
Chen Chen [Thu, 5 Mar 2020 23:02:46 +0000 (15:02 -0800)]
BluetoothMetricid: Add metric allocator api in java
Bug:
142563377
Test: Manual atest AdapterServiceTest
Change-Id: I46d1c1d5bf0c8beea1f46b1024cbd5ceb9c0b562
Merged-In: I46d1c1d5bf0c8beea1f46b1024cbd5ceb9c0b562
(cherry picked from commit
35292e66ecf1508ee64ef76ae297245fb157ff54)
Automerger Merge Worker [Wed, 11 Mar 2020 20:11:58 +0000 (20:11 +0000)]
A2DP: SBC encoding counter errata am:
6add31e02d
Change-Id: I2acb2cefc5a75a5533397c4ccad7c03e7ddb785b
Automerger Merge Worker [Wed, 11 Mar 2020 20:11:56 +0000 (20:11 +0000)]
A2DP: AAC encoding counter errata am:
1253e1d934
Change-Id: I6224af21cd8d804a83256a588f892742b3af1fb7
Cheney Ni [Fri, 14 Feb 2020 12:29:54 +0000 (20:29 +0800)]
A2DP: SBC encoding counter errata
When the encoder interval is 20 milliseconds per tick for {44.1 kHz /
16 bits per sample / Stereo}, there were around three microseconds shift
every tick, but would cause one SBC frame mismatched after 20 seconds.
Here try to adjust the timeline to increase the accuracy by following
methods:
1. add the remainder back to the timeline when converting the time
period to data size.
2. change the timestamp to be presented by values in 1/10 microseconds.
Bug:
149546181
Test: manually
Change-Id: Ic42b2f331628c44aa927c7b9e35562be1fa750c7
Merged-In: Ic42b2f331628c44aa927c7b9e35562be1fa750c7
(cherry picked from commit
c8537f844d1c052e5c9d93981e270dd45d73a709)
Cheney Ni [Thu, 13 Feb 2020 14:25:51 +0000 (22:25 +0800)]
A2DP: AAC encoding counter errata
When the encoder interval is 23 milliseconds per tick for {44.1 kHz /
16 bits per sample / Stereo}, 3 microseconds shift every tick would
cause one AAC frame mismatched after 180 seconds. Here try to adjust the
timeline to increase the accuracy by following methods:
1. add the remainder back to the timeline when converting the time
period to data size.
2. change the timestamp to be presented by values in 1/10 microseconds.
Bug:
149546181
Test: manually
Change-Id: I16742042ba64a9355c39c0248be9208567312a9f
Merged-In: I16742042ba64a9355c39c0248be9208567312a9f
(cherry picked from commit
bae2582df32576f8e95aa78f039fcfdecc962086)
Automerger Merge Worker [Wed, 11 Mar 2020 01:07:16 +0000 (01:07 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours am:
b9e373e364 -s ours am:
78003bf5ef -s ours am:
987f4b2bfe -s ours am:
4e4075a022 -s ours am:
9a73af6849 -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: Ib2916e62eeeb91d4dea9b82620860fc47fbb3e84
Automerger Merge Worker [Wed, 11 Mar 2020 00:54:37 +0000 (00:54 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours am:
b9e373e364 -s ours am:
78003bf5ef -s ours am:
987f4b2bfe -s ours am:
4e4075a022 -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: I5fa2ab47a1e3bdfe51063e04dc916b1ca25bfb73
Automerger Merge Worker [Wed, 11 Mar 2020 00:42:51 +0000 (00:42 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours am:
b9e373e364 -s ours am:
78003bf5ef -s ours am:
987f4b2bfe -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: I0001be297b99dd938b255af6c0986b05236c3895
Automerger Merge Worker [Wed, 11 Mar 2020 00:26:11 +0000 (00:26 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours am:
b9e373e364 -s ours am:
78003bf5ef -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: I9583370dee55f32ebda4a009c1a9a2b5586b1c95
Automerger Merge Worker [Wed, 11 Mar 2020 00:14:09 +0000 (00:14 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours am:
b9e373e364 -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: I19ce865f59ffe8bee30c81401a480d1b32ee632b
Automerger Merge Worker [Tue, 10 Mar 2020 23:58:30 +0000 (23:58 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: Iba77996d7a5acdbee2865868d506634620ccf793
Automerger Merge Worker [Tue, 10 Mar 2020 23:42:03 +0000 (23:42 +0000)]
GattServcer: Check invalid offset am:
30a2860ed1
Change-Id: I1d3aae196fb82155b88e2377e96670797f228f8a
Automerger Merge Worker [Tue, 10 Mar 2020 23:12:51 +0000 (23:12 +0000)]
Merge "BluetoothMetrics: Implement and test metric_id_allocator and lru" into rvc-dev am:
ff1c6de253
Change-Id: I0be2a16ac73f013daab1342da59bb6a12a8ba51c
TreeHugger Robot [Tue, 10 Mar 2020 22:51:00 +0000 (22:51 +0000)]
Merge "BluetoothMetrics: Implement and test metric_id_allocator and lru" into rvc-dev
Automerger Merge Worker [Tue, 10 Mar 2020 22:08:19 +0000 (22:08 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
c14c1fb864 -s ours am:
e3b33dec09 -s ours am:
2dd6490cfe -s ours am:
b632201082 -s ours am:
b4beb08555 -s ours
am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1
7674de8fc8 is in history
Change-Id: I94296c46a4958f2d084baac49d54073bb58f666f
Automerger Merge Worker [Tue, 10 Mar 2020 21:54:03 +0000 (21:54 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
c14c1fb864 -s ours am:
e3b33dec09 -s ours am:
2dd6490cfe -s ours am:
b632201082 -s ours
am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1
7674de8fc8 is in history
Change-Id: I063f752ce3f34ac028dd420fd7f5ae2d2c4e0931
Automerger Merge Worker [Tue, 10 Mar 2020 21:39:14 +0000 (21:39 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
c14c1fb864 -s ours am:
e3b33dec09 -s ours am:
2dd6490cfe -s ours
am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1
7674de8fc8 is in history
Change-Id: I498e1841598b1142881eb386ef9e46faa754cabb
Automerger Merge Worker [Tue, 10 Mar 2020 21:22:16 +0000 (21:22 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
c14c1fb864 -s ours am:
e3b33dec09 -s ours
am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1
7674de8fc8 is in history
Change-Id: Id5714e151ff13706e496b71898712b9410be7746
Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]
GattServcer: Check invalid offset
Test: manual
Bug:
143231677
Merged-In: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Change-Id: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Automerger Merge Worker [Tue, 10 Mar 2020 21:02:22 +0000 (21:02 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
c14c1fb864 -s ours
am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1
7674de8fc8 is in history
Change-Id: Ied357d149b40fd00da201593f9d3e16c899fa7ca
Chen Chen [Thu, 20 Feb 2020 19:29:42 +0000 (11:29 -0800)]
BluetoothMetrics: Implement and test metric_id_allocator and lru
Test: run atest on unittests
Bug:
142563377
Change-Id: I05739258479a67d47550a6cb1db1c6f8c1ff3e98
Merged-In: I05739258479a67d47550a6cb1db1c6f8c1ff3e98
(cherry picked from commit
b12ac65535cda6a4477738ff3e060e6e9be4c08b)
Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]
GattServcer: Check invalid offset
Test: manual
Bug:
143231677
Change-Id: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I97e2c3ae15fccc482d07d8d621c455cc74900cfd
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Automerger Merge Worker [Tue, 10 Mar 2020 03:52:19 +0000 (03:52 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
7674de8fc8 am:
8b1db2dabf am:
a38e11f93d -s ours am:
290fa491b0 -s ours
am skip reason: Change-Id I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8 with SHA-1
09e131ba6b is in history
Change-Id: I6d1dcb6a3fe1d15ccb9c196bcdeae73ae9f60be1
Automerger Merge Worker [Tue, 10 Mar 2020 03:39:07 +0000 (03:39 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
7674de8fc8 am:
8b1db2dabf am:
a38e11f93d -s ours
am skip reason: Change-Id I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8 with SHA-1
09e131ba6b is in history
Change-Id: Iad6db18bc63cd6463c983b247e45aa5a6bec3265
Automerger Merge Worker [Tue, 10 Mar 2020 03:12:00 +0000 (03:12 +0000)]
GattServcer: Check invalid offset am:
7674de8fc8 am:
8b1db2dabf
Change-Id: I1d497b86f89219c8a8885f17bf969a670c6433b6
Automerger Merge Worker [Tue, 10 Mar 2020 03:08:53 +0000 (03:08 +0000)]
Fix bluetooth can't turn off during network reset (3/3) am:
9adf47f6c8
Change-Id: I58900a1e41ba7bbcf6a1774ba1c603ce36eb7629
Automerger Merge Worker [Tue, 10 Mar 2020 02:51:00 +0000 (02:51 +0000)]
GattServcer: Check invalid offset am:
7674de8fc8
Change-Id: I84a04a3671ff7d501bf9bfb483830ec48d30ce62
Alain Michaud [Fri, 7 Feb 2020 01:50:52 +0000 (01:50 +0000)]
avrc: Validating msg size before accessing fields
This change adds buffer length validation during the parsing of AVRCP
browse commands.
Bug:
79945152
Test: net_test_stack
Change-Id: Icfc44f9a91fe004932e15182b1ca3ad5bdac6370
(cherry picked from commit
03bfb9e880764c1fbad3c7ce5159c295f1c6d551)
weichinweng [Thu, 5 Mar 2020 02:53:29 +0000 (10:53 +0800)]
Fix bluetooth can't turn off during network reset (3/3)
Add onFactoryReset into IBluetoothManager interface.
Bug:
110181479
Test: manual
Change-Id: Ic36ffd63c376f84e3c9f0388820da86f63465c8f
Merged-In: Ic36ffd63c376f84e3c9f0388820da86f63465c8f
weichinweng [Thu, 5 Mar 2020 02:53:29 +0000 (10:53 +0800)]
Fix bluetooth can't turn off during network reset (3/3)
Add onFactoryReset into IBluetoothManager interface.
Bug:
110181479
Test: manual
Change-Id: Ic36ffd63c376f84e3c9f0388820da86f63465c8f
Cheney Ni [Wed, 15 May 2019 06:09:49 +0000 (14:09 +0800)]
While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream
There were 2 cases to start the 2nd stream automatically by the stack:
* When the 2nd AVDT opened, the stack would check the 1st stream state
to determinate the 2nd should be starting or not.
* While the AVRC timer which was fired after AVDT opened was expired,
the stack would open the AVRC and start the 2nd stream if the 1st was
started.
Both of them are unnecessary since all the stream must be controlled by
the upper layer. We currently support an active device only, and the
2nd stream will be tracked as remote triggered and suspended immediately.
To samplize the behavior, it is better to not start the 2nd stream
automatically by the stack.
Bug:
132146974
Bug:
150797902
Test: manual
Change-Id: I75f39801e9779ee55fa574e30051e01966c61ea3
Merged-In: I75f39801e9779ee55fa574e30051e01966c61ea3
(cherry picked from commit
ba432366f9959b46e5b28198f2623ac4e32fb94a)