system-bt

Fork

[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr
am: 4291c84baa -s ours
am skip reason: change_id Ib642f79ed22b65ede5ff786cb1e163d172480f11 with SHA1 d4f012bc80 is in history

Change-Id: I73d7f92b5dc4ab723c721edbc53131e8be6c3d79

Merge "Add the package name to setBluetoothTethering" into qt-qpr1-dev

DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

(This CL is missed between oc-dev and oc-mr1-dev)

Bug: 115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11
Merged-In: Ib642f79ed22b65ede5ff786cb1e163d172480f11
(cherry picked from commit d4f012bc80bc68be1cab967958d4cf7e9c1ee442)

Use memcpy instead of casting to convert device_class to int

Bug: 140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)

Use memcpy instead of casting to convert device_class to int

Bug: 140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)

Use memcpy instead of casting to convert device_class to int

Bug: 140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)

Use memcpy instead of casting to convert device_class to int

Bug: 140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)

SDP: disconnect if sdp_copy_raw_data fails

Our partners met with the problem with sdp_copy_raw_data updated in
CVE-2019-2116. When peer device responds with a wrong size,
sdp_copy_raw_data will not complete and won't trigger
disconnection. This CL enables the disconnection when a wrong size is
received.

Bug: 137239831
Bug: 117105007
Test: manual test
Change-Id: I9f0df8b2de28970e7d69b737ce5d363785183bf3
Merged-In: I9f0df8b2de28970e7d69b737ce5d363785183bf3
(cherry picked from commit bc9df3451dad17c1ab1002fdbc85d60e57d4f0af)

Snap for 5869577 from 7255bde470ea60a338601a2adf496983c7e99ff4 to qt-qpr1-release

Change-Id: Iad91c4d82911a0ebc2e8300d943c7b9bfaaf7938

Merge "BLE: Updating the WL if addr_type is not matched for same BDaddr" into qt-qpr1-dev

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours am: db61bc8978 -s ours am: 40ac062848 -s ours am: ee56071b66 -s ours
am: 5c3e64afe7 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I8cb0925a5a44e504051ee0970013dc1fc8bf7ae1

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours am: db61bc8978 -s ours am: 40ac062848 -s ours
am: ee56071b66 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I3c511fd11e78acc9a8ba928ddd0d8a006d2aa20f

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours am: db61bc8978 -s ours
am: 40ac062848 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: Ie70ddf9c2a82f51eaca9704974fd734b846553bb

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours
am: db61bc8978 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I2f3f74f49288ff10fbb570f94a5a6eac6b1d421e

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev
am: 9bc574c618 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: Iffd5b655457623e328f3cce1a5894d8a611cd417

resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev

Bug: 79703832
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id582a274929f10d65e22d71f61de4b8953fed18e
Merged-In: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff

BLE: Updating the WL if addr_type is not matched for same BDaddr

Issue:
Connection is not happening with same remote device after BT
reset.

Steps to Repro:
1. Scan and connect to remote device with "Random" address
2. Toggle BT OFF and ON
3. Without scanning, App tries to connect to remote device and
device gets added as default "Public" addr_type in WL
4. Connection doesn't go through (as expected) since remote device
has "Random" address
5. App cancels the attempt or 30 sec direct connection timeout
happens. The device is marked for removal
6. App scans for the device and the correct addr_type (Random)
is now in the inquiry database in stack
7. App initiates connection for the device but the connection
attempt still goes with "Public" address type and hence never
succeeds.

RootCause:
At step 5, stack just marks the device to be removed from whitelist
(pending_removal) but doesn't actually remove it from Controller
until the next WL connection is needed. Later in step 7, when the
WL connection is needed from the App, stack attempts to add the
device to the whitelist, but realizes that the device is already in
the Controller whitelist and hence doesn't do remove and add.
There is no check to see if the device in Controller's WL is with
correct addr_type.

Fix:
When checking for remote addr that needs to be added/removed
from WL, also take into the account the remote addr_type.

Test:
Tested with the fix multiple times. Issue not seen with this fix.

Bug: 140085561
Change-Id: I415b5fa29800b975c2ebcbf95b36cf8879841b3e

[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev am: a9b50ae838 -s ours
am: f77868ab3c -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I8be4946ae5a23fae8a2da71b68e41a8f427b0bca

[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev
am: a9b50ae838 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I5b647f66f187e1bee38a89cb15ccd13eab6cfa7e

Merge "AVRCP: Keep the device in the map on disconnect" into qt-qpr1-dev

Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: a65f859b17 -s ours am: 441b011410 -s ours am: b1f32a5867
am: 623c1f0965

Change-Id: Ie40ba59c57628ef89e8951225551a08140e7402f

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: b2334f0589 -s ours am: 10a884f61f
am: 61fcafaec8

Change-Id: Id02291491be0b55e44b73cb1d7620f5ef39854da

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: a65f859b17 -s ours am: 441b011410 -s ours
am: b1f32a5867

Change-Id: I4d4b8817a909fe33fd213029b19fd45ec0b37c80

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: a65f859b17 -s ours
am: 441b011410 -s ours
am skip reason: subject contains skip directive

Change-Id: I1854ec89e994337d44522ddbf9da2366991d17a4

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: b2334f0589 -s ours
am: 10a884f61f

Change-Id: I77eb3ddf1f8a06c4a88435660f82aab23e301738

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
am: a65f859b17 -s ours
am skip reason: subject contains skip directive

Change-Id: I33793fde2925c0a87cb043238b22862cdd7d40b3

[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
am: b2334f0589 -s ours
am skip reason: subject contains skip directive

Change-Id: I86a56a7c0b4676005b8b39eb6c800f834b68ef41

AVRCP: Keep the device in the map on disconnect

Fixes a stack crash when disconnecting AVRCP

If an AVRCP connection, established by AVRC_OPEN_IND_EVT, is disconnected
by calling DisconnectDevice() in Connection Handler, there is a corner
case that does not clear Connection Control Block (CCB) entirely of a
opened handle.
So when there is re-connection trials, partially cleared CCBs causes
a critical stack crash.

When calling DisconnectDevice() in Connection Handler, there are issues.
-Keeping removed CCB info partially, such as member variable "allocated",
even though receiving AVRC_CLOSE_IND_EVT followed by clearing
Link Control Block (LCB).
-Keeping remote device address in feature_map_

This commit fixes the issue of above scenario, by keeping handle in
device_map_ and removing to send disconnected notification
when calling DisconnectDevice().
So when receiving AVRC_CLOSE_IND_EVT, normal procedure is conducted.

Note that AVRC_CLOSE_IND_EVT is occurred by both
AVCT_DISCONNECT_IND_EVT and AVCT_DISCONNECT_CFM_EVT.
And when calling avrc_->Close() in DisconnectDevice(), it just requests
to unbind LCB instead of dealloc CCB.
And when receiving AVRC_CLOSE_IND_EVT avrc_->Close() dealloc CCB.

Bug:139642151
Test: Test on phone with some products which has A/V Remote Control
such as Britz(BE-ME350) and airpod
Change-Id: Ic8bc3459afd4518447d6d52b1f8afb7b3e09a8b5
Signed-off-by: Joonghong Park <joonghong.park@samsung.com>

Snap for 5845810 from 7080584a1b69931dc069bf17a5942d66285d409c to qt-qpr1-release

Change-Id: I2d8f696e16dad9b066cda7abd464ef7404495a8f