Change-Id: I4f61ceeb24f8a727f6985a3ee991422e755643dd

Bug: 259631398

This reverts commit c5eee33a.

Reason for revert: Causing b/259631398. Connection will be terminated unexpectedly when connection is in the middle of role switching with the device that does not support EPR.

Test: Regression test
Change-Id: I063e31fd74a8b319439386ecde4ce1a633b6d7bf
Merged-In: I063e31fd74a8b319439386ecde4ce1a633b6d7bf
(cherry picked from commit 03feaca1)
(cherry picked from commit 8d7d555a1710d135e474ac5d7232e2f02ddcc25b)
Merged-In: I063e31fd74a8b319439386ecde4ce1a633b6d7bf

Change-Id: I877d6b5458f2fd4cc3402516fa6aa7c1d2df5f09

Bug: 258057241
Test: atest net_test_stack_avdtp
Ignore-AOSP-First: security
Merged-In: I9c87e30ed58e7ad6a34ab7c96b0a8fb06324ad54
Change-Id: I9c87e30ed58e7ad6a34ab7c96b0a8fb06324ad54
(cherry picked from commit 5f8babc9)
Merged-In: I9c87e30ed58e7ad6a34ab7c96b0a8fb06324ad54

The current implementation uses `pad_len = *(p_start + len);`
to read the last byte from the packet, resulting one-byte
out-of-bound read.

Also avdt_scb_hdl_pkt_no_frag passes zero-lenth packets to
upper-layer, this patch adds code to detect such packets
and err out if detected.

The regression test is I9c87e30ed58e7ad6a34ab7c96b0a8fb06324ad54

Bug: 258057241
Test: atest net_test_stack_avdtp
Ignore-AOSP-First: security
Merged-In: If0c7b25f2e6cb4531bbb6254e176e8ad1b5c5fb4
Change-Id: If0c7b25f2e6cb4531bbb6254e176e8ad1b5c5fb4
(cherry picked from commit 89255db5)
Merged-In: If0c7b25f2e6cb4531bbb6254e176e8ad1b5c5fb4

isBluetoothShareUri_correctlyCheckUri (under
com.android.bluetooth.opp.BluetoothOppUtilityTest) is failing
on null input due to an incorrect comparison in
isBluetoothShareUri.  Change the comparison to one which can
cope with null input.

Bug: 257190999
Test: atest: BluetoothOppUtilityTest
Tag: #security
Ignore-AOSP-First: Security
Change-Id: I61118f22577de7b975fb0df8dac8583e91f7b8c7
(cherry picked from commit c9b53b95)
Merged-In: I61118f22577de7b975fb0df8dac8583e91f7b8c7
(cherry picked from commit 8c312386)
Merged-In: I61118f22577de7b975fb0df8dac8583e91f7b8c7

Change-Id: I84be122e3754990c4575d15c7e7c558c83becb42

bta_hf_client_at does not properly check bounds on its inputs,
allowing a buffer overflow when fed a buffer that is more than
twice the expected maximum size.  Add a new bounds check to
enforce, and a new security test to validate.

Bug: 231156521
Test: atest: BtaHfClientSecurityTest
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I2cf89a786ba7cd0423eaccd8082bd824ac2f0d43
(cherry picked from commit f8adec66)
Merged-In: I2cf89a786ba7cd0423eaccd8082bd824ac2f0d43

Pixel devices in the field appear not to drop the connection or
reestablish encryption after receiving a command to disable link
layer encryption on an encrypted link, a certification
requirement.  Add a check forcing connections to drop in this case.

Bug: 251436534
Test: atest: bluetooth, lab validation forthcoming
Tag: #security
Ignore-AOSP-First: Security
Change-Id: Ie9d69be65fa1163c1ee10ca19153e98e737743cb
(cherry picked from commit 8c63c7c1)
Merged-In: Ie9d69be65fa1163c1ee10ca19153e98e737743cb

Tag: #feature
Bug: 254609888
Ignore-AOSP-First: tm-qpr feature
Test: atest net_test_stack:A2dpCodecConfigTest#init
Change-Id: I5e19883310be7119f777f823e6963465b5bc1a2b
(cherry picked from commit 780a0eee)
Merged-In: I5e19883310be7119f777f823e6963465b5bc1a2b

Allow GATT to use 2M phy.

Test: manual QA testing
Bug: 245969911
Change-Id: I1e3458423dde7f5b7240f573955fec7b5b83e9d2
(cherry picked from commit 6221f7f4)
Merged-In: I1e3458423dde7f5b7240f573955fec7b5b83e9d2
(cherry picked from commit fc56c743)
Merged-In: I1e3458423dde7f5b7240f573955fec7b5b83e9d2

Le device connected by more then one APP, fix can't write characteristic issue.

Tag: #bugfix
Bug: 243105389
Bug: 243184580
Test: manual
Signed-off-by: chenlei7 <chenlei7@xiaomi.com>
Merged-In: Icff2d56ac885bf04b212d2b608bfc69f25350179
Change-Id: Icff2d56ac885bf04b212d2b608bfc69f25350179
(cherry picked from commit aed67660)
Merged-In: Icff2d56ac885bf04b212d2b608bfc69f25350179

Change-Id: Iac9e94e6dad2a084e0101d9765a53e7d3e887805

Revert "Add tests for BluetoothProfile.close"

Revert submission 19938469-BluetoothProfile_close

Reason for revert: Creating a revert CL only for QPR1
Reverted Changes:
I51ad4e0ec:Make onServiceDisconnected be called
Ic5188c62e:Add tests for BluetoothProfile.close

Bug: 249213217
Change-Id: Id180e12f1dc6da48f68797a70c3095e6bf444a21
(cherry picked from commit b773c175d566085f4bdf2a0e629882535131c50e)
Merged-In: Id180e12f1dc6da48f68797a70c3095e6bf444a21

Change-Id: Ic2bd1aed0f8730c5a0e7289c783dc479691470ca

Bug: 225880741
Test: BT unit tests, validated against researcher POC
Tag: #security
Ignore-AOSP-First: Security
Change-Id: I1330080abfd638fb36aad9535b6f5f5872986a7f
(cherry picked from commit 29a297b4)
Merged-In: I1330080abfd638fb36aad9535b6f5f5872986a7f

Bug: 232023771
Test: make
Tag: #security
Ignore-AOSP-First: Security
Change-Id: I68dd78c747eeafee5190dc56d7c71e9eeed08a5b
(cherry picked from commit 9f083ec9)
Merged-In: I68dd78c747eeafee5190dc56d7c71e9eeed08a5b

Change-Id: Ie4107f1f9fa20dfecbd2882ccd18787ff8d4d9b1

Tag: #feature
Bug: 245770306
Test: system/gd/cert/run --clean --sl4a_sl4a OobPairingTest
Ignore-AOSP-First: Merging into QPR branch first
Change-Id: If935583dab725ea41585e04e67aeb6e283e23683
(cherry picked from commit 3ae98d68)
Merged-In: If935583dab725ea41585e04e67aeb6e283e23683

This test verifies that GATT reconnections succeed after an IRK
rotation.

Bug: 237600923
Test: system/gd/cert/run --clean --sl4a_sl4a IrkRotationTest
Merged-In: Idc54f21f366074070f245fccd9fdda14a50e1645
Change-Id: Idc54f21f366074070f245fccd9fdda14a50e1645
(cherry picked from commit c55ac6b8)
Merged-In: Idc54f21f366074070f245fccd9fdda14a50e1645

Change-Id: I5caf7f30e822b16fb216bbd9f6662fbf18504cf6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20084786



Change-Id: I05dd2c4d3a17b37eea53930df2d2b407ac711d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20084786



Change-Id: I53c37e83721de1942c02633a8210f208da1ce073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Change-Id: Ie591bf68237235f08b215bb70b34f5714debdb4a

This reverts commit cde75cf5.

Bug: 249815584

Reason for revert: ag/249815584 Breaks P1 feature

Change-Id: Ia146484522ba0eab118e74c65122bc1cd1a5f2a0

Ignore-AOSP-First: Security fix
Test: Flashed build, set the prop and watched the stack restart
Bug: 195410559
Change-Id: I6496b34c144e697308109d5ee9528f4ae5c9b4b4

Change-Id: Ic3cf76b8bf21034565531652bd42d80c4a394b3e

If it is not possible to Active already configured ASEs, fallback to
configure group again instead of going to CigCreate

Bug: 247108587
Test: atest BluetoothInstrumentationTests
Tag: #feature

Merged-In: I559bf233a44982fb8b80517dc4c95d07736b0b2e
Change-Id: I559bf233a44982fb8b80517dc4c95d07736b0b2e
(cherry picked from commit 37b364ba)

Set low latency audio allowed status when follwoing condition to inform
audio hal low latency mode change.
1. A2dp connected
2. Codec config updated
3. Active device changed
4. Optional codec disabled/enabled

Bug: 247680090
Test: atest GoogleBluetoothInstrumentationTests:A2dpStateMachineTest
Ignore-AOSP-First: tm-qpr feature
Change-Id: I41e77973e21f241b160b1a12174892d55f34333b

Make sure to not notify connected until all the CCC are registered and
MTU is changed on the reconnection.

Otherwise, when reconnected during streaming, stream will not be able to
setup because GATT is busy with the descritors registration and MTU
change.

This is regression after:
4b1536c90b5  leaudio: Fix the MTU exchange request

Bug: 228351333
Test: atest BluetoothInstrumentationTests
Test: manual: Connect earbuds while streaming
Tag: #feature
Merged-In: I5b023907764e6c4552f199a8a17f02e5bddbd0de
Change-Id: I5b023907764e6c4552f199a8a17f02e5bddbd0de
(cherry picked from commit 50805bd5)

Based on discussion in linked bug, to prevent further regressions if the
latest fixes are still incomplete.

Bug: 195410559
Test: compiles
Ignore-AOSP-First: security
Change-Id: I1741929c639f2dbc6417974bf3287d8d141e33df
(cherry picked from commit 924c3a96)
Merged-In: I1741929c639f2dbc6417974bf3287d8d141e33df

Otherwise we stop rotating our address and lose all benefits of privacy.

Ignore-AOSP-First: Security fix
Bug: 246692649
Test: Nearby QA test, and I'll write a cert test eventually
Tag: #stability
Change-Id: Ib63d79256acbb956413849c17f761aa902fa2eae
(cherry picked from commit 279e3c3a)
Merged-In: Ib63d79256acbb956413849c17f761aa902fa2eae

We need to pause all advertising before changing the random address, and
we need to also change the addresses used for each advertising set. We
also should ensure no active connections etc. are taking place when the
address is changed.

Note that this means there will be some latency between the address
change in legacy before it is changed in GD, but I don't know how to
avoid this.

Ignore-AOSP-First: Security fix
Test: manual / TODO
Bug: 245453591
Tag: #stability
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ia897a55320741993467d286550949a802657d399
(cherry picked from commit b275c66d)
Merged-In: Ia897a55320741993467d286550949a802657d399

Bug: 243922806
Tag: #security
Test: visual inspection
Ignore-AOSP-First: Security
Change-Id: I052310c0a087062ed033748178a7331331f2f23e