OSDN Git Service
Cheney Ni [Wed, 25 Mar 2020 10:37:33 +0000 (18:37 +0800)]
BluetoothAudioHAL: Have full initialization for audio hardware objects
Audio frameworks usually check whether a module has specific features by
particular function pointers, and must be null if unsupported. If a
module is not fully initialized, some pointers would be undefined, but
causes abnormal crashes when accessed by audio frameworks.
Bug:
152379666
Test: manually
Change-Id: Id6a79b651f2acbd35bd509ba36a80adea5c13e05
Merged-In: Id6a79b651f2acbd35bd509ba36a80adea5c13e05
(cherry picked from commit
7397c51ac706d3577b277d7b5bcdc78c78fcc6ac)
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 [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 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 [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 [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: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 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: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: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: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: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: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)
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 [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)
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: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
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
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
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)
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)
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 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
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 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: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 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)
Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]
GattServcer: Check invalid offset
Test: manual
Bug:
143231677
Change-Id: I97e2c3ae15fccc482d07d8d621c455cc74900cfd
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Automerger Merge Worker [Wed, 4 Mar 2020 00:01:01 +0000 (00:01 +0000)]
AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() am:
7a6fd5459e am:
c4d6c95107 am:
0dd50b24a3
Change-Id: Ief856194be69171831a004f1bcb283d09aba2364
Automerger Merge Worker [Tue, 3 Mar 2020 23:49:37 +0000 (23:49 +0000)]
AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() am:
7a6fd5459e am:
c4d6c95107
Change-Id: I7f0f617b594bd6800a92d5a04e8ef0ce0f285cd2
Automerger Merge Worker [Tue, 3 Mar 2020 23:32:21 +0000 (23:32 +0000)]
AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() am:
7a6fd5459e
Change-Id: I8fb43f7467aedd4e36237d7f355c8ed175e1e33c
Jakub Pawlowski [Mon, 24 Feb 2020 16:22:00 +0000 (17:22 +0100)]
Security: Allow UI handlers in either order
Handle case when UI Handlers are invoked in different order
Bug:
150054218
Change-Id: I0f7a4fec63632771ac4ef1077e70c3f6020f6969
(cherry picked from commit
5a59911e3e1ad473e9134a5e58021932adeaa83d)
Jiyong Park [Mon, 24 Feb 2020 09:39:19 +0000 (18:39 +0900)]
Mark updatable APEXes
Mark updatable APEXes as updatable: true so that they are opted-out from
optimizations that make sense only for non-updatable modules; such as
symlinking to the libs in the system partition.
Bug:
149805758
Test: m and check that there is no symlink from the APEX to the system
partition.
Change-Id: Id21fa176acce4800fb8e6c723007f6a4aa2d1bab
Automerger Merge Worker [Fri, 21 Feb 2020 23:30:01 +0000 (23:30 +0000)]
Merge "Add functions to integrate the full spec of LDAC SNK" am:
2b876a8749 am:
0d7645a47f am:
949a84631e
Change-Id: Ia966c7181c5ba16e03550cf4258db7ae7d608c32
Automerger Merge Worker [Fri, 21 Feb 2020 23:20:41 +0000 (23:20 +0000)]
Merge "Add functions to integrate the full spec of LDAC SNK" am:
2b876a8749 am:
0d7645a47f
Change-Id: I393265a11dab26efaf6c269e1bed75d1e071f0a5
Automerger Merge Worker [Fri, 21 Feb 2020 23:11:00 +0000 (23:11 +0000)]
Merge "Add functions to integrate the full spec of LDAC SNK" am:
2b876a8749
Change-Id: I157c9b4ecf1dfa42fd6371bcfccebf5aff1f1ec5
Automerger Merge Worker [Fri, 21 Feb 2020 22:55:05 +0000 (22:55 +0000)]
Merge "gd: l2cap classic fixed channel test" am:
5269d9d677 am:
3bba25a2af am:
0b7d4f87cc
Change-Id: I630ed2e5f55e709a62af9659bd6950abb90dd67c
Automerger Merge Worker [Fri, 21 Feb 2020 22:54:57 +0000 (22:54 +0000)]
Merge "Remove C++ cert stack" am:
1154e22ec4 am:
426785b325 am:
1168bc88e4
Change-Id: I45589ceaf3c61b2ac288b9c63b4feb6e4d8df2de
Treehugger Robot [Fri, 21 Feb 2020 22:53:25 +0000 (22:53 +0000)]
Merge "Add functions to integrate the full spec of LDAC SNK"
Automerger Merge Worker [Fri, 21 Feb 2020 22:42:05 +0000 (22:42 +0000)]
Merge "gd: l2cap classic fixed channel test" am:
5269d9d677 am:
3bba25a2af
Change-Id: I655ae820b01e7a400d52157bf70d0d2d4ebe373c
Automerger Merge Worker [Fri, 21 Feb 2020 22:41:49 +0000 (22:41 +0000)]
Merge "Remove C++ cert stack" am:
1154e22ec4 am:
426785b325
Change-Id: I6aa75b937ff65a82ef102e5472a2c30155b7642d
Automerger Merge Worker [Fri, 21 Feb 2020 22:37:14 +0000 (22:37 +0000)]
Merge "gd: l2cap classic fixed channel test" am:
5269d9d677
Change-Id: Id3aa3287a253e845520927e5310cf8715c70f2d7
Treehugger Robot [Fri, 21 Feb 2020 22:31:10 +0000 (22:31 +0000)]
Merge "gd: l2cap classic fixed channel test"
Automerger Merge Worker [Fri, 21 Feb 2020 22:28:53 +0000 (22:28 +0000)]
Merge "Remove C++ cert stack" am:
1154e22ec4
Change-Id: Id1f89b0e45d36c7f30c4df8410226a2a684a5639
Treehugger Robot [Fri, 21 Feb 2020 22:21:18 +0000 (22:21 +0000)]
Merge "Remove C++ cert stack"
Automerger Merge Worker [Fri, 21 Feb 2020 18:06:38 +0000 (18:06 +0000)]
Merge "Refactor of headless test to allow additional tests" am:
7c2d86ff45 am:
81fd40af90 am:
5df7edecd7
Change-Id: I983198e4d3fefde2f0d218dc7678ce71d79e616e
Automerger Merge Worker [Fri, 21 Feb 2020 18:06:29 +0000 (18:06 +0000)]
Merge "L2capTest: Migrate all remaining test cases" am:
015b3c71da am:
c1e467f38b am:
ad3cec6be4
Change-Id: I5ff30b6a7cfc089e97310b70fae9bedaa7ed466e
Automerger Merge Worker [Fri, 21 Feb 2020 18:06:20 +0000 (18:06 +0000)]
Merge "L2CAP: Add test for L2CAP 2/7 Support of command information response" am:
9cce7c4407 am:
c38af46d67 am:
60aaeadebb
Change-Id: I45c3f86b822c06f47aff63773fafe92bfc6bc47b
Automerger Merge Worker [Fri, 21 Feb 2020 18:06:10 +0000 (18:06 +0000)]
Merge "gd: Fix legacy storage test config file" am:
e4070f09a0 am:
9730313c3a am:
0520d89e1c
Change-Id: I39bc95ee646a09651d47fc465d3c89949ff99274
Automerger Merge Worker [Fri, 21 Feb 2020 17:44:42 +0000 (17:44 +0000)]
Merge "Refactor of headless test to allow additional tests" am:
7c2d86ff45 am:
81fd40af90
Change-Id: Ie79bcd403f758f02a166bbb93c8150977f8f9c91
Automerger Merge Worker [Fri, 21 Feb 2020 17:44:35 +0000 (17:44 +0000)]
Merge "L2capTest: Migrate all remaining test cases" am:
015b3c71da am:
c1e467f38b
Change-Id: I5580bc2d8df205c592352893184aa69b681b6c68
Automerger Merge Worker [Fri, 21 Feb 2020 17:44:28 +0000 (17:44 +0000)]
Merge "L2CAP: Add test for L2CAP 2/7 Support of command information response" am:
9cce7c4407 am:
c38af46d67
Change-Id: I72a45a7fc0b6c351a12b0009c41c4f93967254c9
Automerger Merge Worker [Fri, 21 Feb 2020 17:43:08 +0000 (17:43 +0000)]
Merge "gd: Fix legacy storage test config file" am:
e4070f09a0 am:
9730313c3a
Change-Id: I793068298edc37b4b5279bd45a019c3b60cd22fe
Automerger Merge Worker [Fri, 21 Feb 2020 17:42:41 +0000 (17:42 +0000)]
Merge "Refactor of headless test to allow additional tests" am:
7c2d86ff45
Change-Id: I9a06b548c51dfdaf0c90473b89327ca96de3a7d9
Hansong Zhang [Fri, 21 Feb 2020 17:32:31 +0000 (09:32 -0800)]
Remove C++ cert stack
Test: cert/run_cert_facade_only.sh
Change-Id: I91dc5569fbb0226b1b8e18ac62113803eea70c3d
Treehugger Robot [Fri, 21 Feb 2020 17:29:32 +0000 (17:29 +0000)]
Merge "Refactor of headless test to allow additional tests"
Chris Manton [Fri, 21 Feb 2020 16:16:07 +0000 (08:16 -0800)]
gd: l2cap classic fixed channel test
cleanup EXPECTs
Bug:
146363262
Test: bluetooth_test_gd --gtest_repeat=1000 # x86
Change-Id: Ibb9838d0c1014a187168571a375282b7686e60da
Automerger Merge Worker [Fri, 21 Feb 2020 17:21:29 +0000 (17:21 +0000)]
Merge "L2capTest: Migrate all remaining test cases" am:
015b3c71da
Change-Id: Ia4775c8d93a41be3449473ca4fad5a37bd7abe7f
Automerger Merge Worker [Fri, 21 Feb 2020 17:21:21 +0000 (17:21 +0000)]
Merge "L2CAP: Add test for L2CAP 2/7 Support of command information response" am:
9cce7c4407
Change-Id: I42ae0b7503a6eb7273e496ed357a6d5a6f6eaf8a
Automerger Merge Worker [Fri, 21 Feb 2020 17:20:45 +0000 (17:20 +0000)]
Merge "gd: Fix legacy storage test config file" am:
e4070f09a0
Change-Id: I5609aa4341aa943b4ba76d699e04e3d8b62a9ad9