system-bt

Fork

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev

Snap for 5968679 from fbadb0d1421825fcd7b7a8442ff1410603c705a1 to qt-qpr2-release

Change-Id: I03a4e1138516a3d0e4cb98963f773c23a4f1f2da

Merge "HFP: remove the dropped HF connection request message in btif connect_queue and advance to the next scheduled connection request." into qt-qpr1-dev

Merge "Prevent bluetooth native crash during failed security authentication" into qt-qpr1-dev

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

HFP: remove the dropped HF connection request message in btif connect_queue and advance to the next scheduled connection request.

* hf connect-request message does not be handled in btif connect_queue when remote headset has already reconnected hfp, but it did not be removed, either.
it will make subsequent connecting request messsages blocked in btif connect_queue and never be handled.
* Add unit test for btif_profile_queue to verify the case when connect_cb() returns non BT_STATUS_SUCCESS

Bug: 140846154
Test: Connected 2 headset (HS1, HS2) -> Disable Bluetooth and Turn Off
HS2 -> Enable Bluetooth and Turn On HS2 -> Check hfp and a2dp profole
state after HS2 connected

Change-Id: I503fba1975054efe3180ecf1f7daa917fb6edf99

Snap for 5945193 from fcd93fd2a29f4a69f98cb650a0b982dbfc42418e to qt-qpr2-release

Change-Id: I5569954bbe475b21e21d0b632ba2406e81f14bed

Android 7.1.2 Release 39 (5787804)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXZfNxQAKCRDorT+BmrEO
eBH8AKCRjTcEH2gzxGlfmeiFODksmLfTzQCfZS/639xS5uR6350Ik6eCvBSPkCU=
=E818
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r39' into nougat-x86

Android 7.1.2 Release 39 (5787804)

Conflicts:
bta/pan/bta_pan_act.c
stack/bnep/bnep_utils.c

Fix potential OOB write in btm_read_remote_ext_features_complete

Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.

Bug: 141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a

Fix potential OOB write in btm_read_remote_ext_features_complete

Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.

Bug: 141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a

[system][bt] fix -Wdangling-gsl am: 20ed45d633 am: 2f0c176bad am: 2bcb84cd7d am: 6c6ffc3d18 am: 9e474d2ee6
am: be1c9c3248

Change-Id: I25f8df91c9fb578829bafa44f9f0adfa7580c117

Merge "resolve merge conflicts of 26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev am: 01c69ce222 am: fee0b616ea
am: cdbe4a31bb

Change-Id: I4a1362cb21e95cecf271ab2d596168533aae99ef

[system][bt] fix -Wdangling-gsl am: 20ed45d633 am: 2f0c176bad am: 2bcb84cd7d am: 6c6ffc3d18
am: 9e474d2ee6

Change-Id: I343bab88804aed8f0120f6719e78dc633ff96f35

[system][bt] fix -Wdangling-gsl am: 20ed45d633 am: 2f0c176bad am: 2bcb84cd7d
am: 6c6ffc3d18

Change-Id: I7d24cb7afab04cd92c526417930884ec133a0c4c

Merge "resolve merge conflicts of 26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev am: 01c69ce222
am: fee0b616ea

Change-Id: I738b73e6a8b5fff974f286168bc8ec9523501411

[system][bt] fix -Wdangling-gsl am: 20ed45d633 am: 2f0c176bad
am: 2bcb84cd7d

Change-Id: I216e30fb5fb6ca5cadb7821d33825db4f197d087

Merge "resolve merge conflicts of 26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev
am: 01c69ce222

Change-Id: Ie358b950ce8488361da18d040d5e825eda79a795

Merge "resolve merge conflicts of 26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev

[system][bt] fix -Wdangling-gsl am: 20ed45d633
am: 2f0c176bad

Change-Id: I82b0d0a3b21111b8711d58609c3f70f4637bc74b

[system][bt] fix -Wdangling-gsl
am: 20ed45d633

Change-Id: I9f59103dc40ae2154a2b2314d309ba0f7184376a

Fix potential OOB write in btm_read_remote_ext_features_complete

Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.

Bug: 141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a

Fix potential OOB write in btm_read_remote_ext_features_complete

Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.

Bug: 141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a

Android 8.1.0 Release 69 (5794017)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXZfQjQAKCRDorT+BmrEO
eGnsAJ9Ue4ZRZUiakMPdUIv9+AR2wt22zwCfW+VFvdTeQDvImdf1rOO35Gt8KNE=
=ZgTw
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r69' into oreo-x86

Android 8.1.0 Release 69 (5794017)

Conflicts:
stack/btu/btu_hcif.cc
stack/sdp/sdp_discovery.cc

Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails

If the cuttlefish device does not have an rtc device (such as the crosvm
VMM) the bt osi layer can promote crashes due to it not being able to
create a CLOCK_BOOTTIME_ALARM timer. Bring back a fallback but enable it
at runtime instead of compile time.

Bug: 126955943
Test: run with cuttlefish
Change-Id: I3ab0282b3e8fde776aa7b37d5772c8f62cf957bf

Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails

If the cuttlefish device does not have an rtc device (such as the crosvm
VMM) the bt osi layer can promote crashes due to it not being able to
create a CLOCK_BOOTTIME_ALARM timer. Bring back a fallback but enable it
at runtime instead of compile time.

Bug: 126955943
Test: run with cuttlefish
Change-Id: I3ab0282b3e8fde776aa7b37d5772c8f62cf957bf

[system][bt] fix -Wdangling-gsl

BtAddrString() returns a std::string. It's not safe to chain a call to
c_str() as otherwise the returned std::string is a temporary, and the
expression evaluates to an immediately dangling pointer.

Bug: 139945549
Bug: 142558228
Test: mm
Change-Id: I30972458abcc563b24ee0d80b289c3efd6c3e04d
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

Prevent bluetooth native crash during failed security authentication

* Use-after-free issue cause Bluetooth native crash during failed security authentication
* fixes a regression caused by commit SHA 26d629c

Bug: 137828534
Test: pair with Bluetooth keyboard/carkit -> input incorrect PIN code.
Change-Id: Ia1f7dad678fc71ebf4af6b943c6a9e6102e67592

Snap for 5936642 from cf1603ebaca00c8262feb0901cd481ca03d8c035 to qt-qpr2-release

Change-Id: I8e1f60f8239313b259da01820fe73c7353d21eb6

Revert "Confirm the presence of BT key when BT ON"

This reverts commit bd8c5865c9991dd318c7ac47263b527ad7a4cd9b.

Bug: 139930706
Test: Manual
Change-Id: Ie80622782563bd38ee3421e7d3585ebd112482bf
(cherry picked from commit ae055008f4cc8e0a06dd9cf7a473d94b1c2bbcfd)