system-bt

Fork

Add missing include for OSI_NO_INTR

Fixes building bt_vendor_linux since
OSI_NO_INTR is defined in osi.h

Change-Id: Ib95a3126ed4a7b8f0bdc7db3dd2ef162825f2cbe
Signed-off-by: Stefan Stanacar <stefan.stanacar@intel.com>

Fix Linux libbt-vendor build

Fix enumeration values not explicitly handled in switch;
Fix the undefined reference to functions from libosi.

Change-Id: I64ab3d57d1c4879ad47ae1a03f8996287877535d
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>

vendor_libs: create Android.mk

all-subdir-makefiles call works for only one
nested sublevels, so we need to add a default
Android.mk in order to be able to build libbt-vendor module.

BUG=28014054

Change-Id: I7cc004d2a4dd6216a80d13c6384d9dcde328323e
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>

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

[REVERT ME] Ignore time out for HCI_WRITE_SCAN_ENABLE command

Sometimes the HCI_WRITE_SCAN_ENABLE command times out on HCI USB BT devices but
the device works properly so ignore it for now.

Change-Id: I90518233a689538d9067e7e09fa67347063fbd2a

Do not read BLE vendor capability to restore AOSP behaviour

This makes it possible to support multiple device types. Otherwise devices
that do not support this command will cause enabling BT to time out.

This is a combination of 2 commits.

Revert "BT: Fix up device not turning on due to BLE command"

This reverts commit 1a2f814383ffde3cc77e8dbd5d4fa675d1211d04.

Revert "Bluetooth: Read BLE vendor capability to proceed on Secure conn"

This reverts commit e787d761ab50bae45c15a0c74bf9a43f44e7076c.

Conflicts:
hci/src/hci_layer.c

Change-Id: I71584f538ffe0aee506212ba0a4507586d6964c6

bt: Use HCI H4 HAL for BT SOC ATH3K

The Kindle HDX devices use an Atheros SoC for WIFI/BT and previously used the
H4 HCI driver in the system/bt HAL. However, due to CAF commit:
https://github.com/CyanogenMod/android_system_bt/commit/eb46fdb217ac117b83202d7471199e6042ed18a9

The logic changed from using a BLUETOOTH_HCI_USE_MCT define to instead
looking at BT SOC chip property. Unfortunately, it looks like CAF left
BT_SOC_ATH3K out of the H4 selection check (it's not a common configuration
now in QCOM devices). Adding it to the H4 HAL check fixes bluetooth on
the HDX devices.

Change-Id: Ic8ebfb83627537d71b117dfc83a07e0a1f9f4749

bt: Use HCI H4 HAL for BT SOC ATH3K

The Kindle HDX devices use an Atheros SoC for WIFI/BT and previously used the
H4 HCI driver in the system/bt HAL. However, due to CAF commit:
https://github.com/CyanogenMod/android_system_bt/commit/eb46fdb217ac117b83202d7471199e6042ed18a9

The logic changed from using a BLUETOOTH_HCI_USE_MCT define to instead
looking at BT SOC chip property. Unfortunately, it looks like CAF left
BT_SOC_ATH3K out of the H4 selection check (it's not a common configuration
now in QCOM devices). Adding it to the H4 HAL check fixes bluetooth on
the HDX devices.

Change-Id: Ic8ebfb83627537d71b117dfc83a07e0a1f9f4749
(cherry picked from commit e3044f640516b2e0960e2d20c2211d48738dafdd)

Mask out HFP 1.7 feature bits if peer version is <1.7

Bug: 32378402
Merged-In: I568e8c4c584d56d744cf7a30273feac1d8d4c4df
Change-Id: Iac8684bdfd02b18cce260bedefb829e8f7285361
(cherry picked from commit 1ad2678e2ff5fa3dbfae9dc76ab646db10794e4e)
(cherry picked from commit 571f23ca31cdbc87cae8c078b5885246dd779498)
(cherry picked from commit ebba3ef2ea5061a48aa0de49ebfdb98df64d803f)

Fix AG API result code to internal result code mapping.

Change-Id: Ida47f2e5a3dfbe1560eaa993dfc549177ea74ea5

Merge remote-tracking branch 'github/cm-14.0' into cm-14.0-x86

Android 7.1.0 release 4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgJEpYACgkQ6K0/gZqxDnhgxACffyDNTYi/u+ulFQVgQtxkpqQp
3DIAn0UpsQs2Wv+SGKxJRKiPreyC6NPv
=IXdt
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/system/bt into 71

Android 7.1.0 release 4

Change-Id: I8a1c7c45627e3575626ad6b2582da35a4ab2f53f

merge in nyc-mr1-release history after reset to nyc-mr1-dev

Revert HFP 1.7 for new impl

Revert "Set HF indicators bit only when remote supports it."

This reverts commit 14c7c069f4d1c8b39524592c81e4ee680383d3ce.

Revert "AG: Set/Unset HF indicator bit based on remote device"

This reverts commit 616d128c492467dfe4e689e4aca8227bd600cf89.

Revert "BT-HFP: HFP1.7 AG support in bluedroid"

* Taking upstream impl.

This reverts commit 840cf9b195677203cf0cd655e8ab280273571c09.

Change-Id: Icd5e9a0223ace1a4b9d7fe046708a5e34fbe2a36

Revert "Don't unset the HF indicators and S4 Settings for PTS"

This reverts commit bc20346d0004c6493adb7bf667d204d1c12adbc1.

Change-Id: I09b841dd76c9af677f4286bbe759a3f906754ea5

Revert "Dynamic HF version change based on remote hf version"

This reverts commit a8722609d64ceaf62895b3a2fe2ce23e1a54a2a3.

Change-Id: I79805a54cedbb6b21a4c75f13e79d05ac592869c

Revert "BT-HFP: HFP1.7 AG support in bluedroid"

This reverts commit 840cf9b195677203cf0cd655e8ab280273571c09.

Change-Id: Id121c7bb6811263326a459ce84f44baf6ad9acfe

Fix random crashes in HID related code

Operation on characteristics/descriptors shouldn't access GATT database
when it's executed. This could happen while service rediscovery is in
progress.

Bug: 32240759
Test: connect to HID device
Change-Id: Ie2b6e6b451456204b1cea1e500df9a0ff949a9ef
(cherry picked from commit d8f09d077d9017a522c17f4b9a49328b0ed3e91e)

merge in nyc-mr1-release history after reset to nyc-mr1-dev

Reset device security flags when pairing fails

Bug: 29998634
Test: manual
Change-Id: Icd9a76a065de147372df060c0b9555c75bcf46bc

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/system/bt into cm-14.0

"LA.UM.5.5.r1-00900-8x96.0"

Merge f3be84555a575f8ab6089a54df927364231972e3 on remote branch

Change-Id: I7345485ad7aef5b964fdda23a1cc008f536e4ff9

[FOR UPSTEAM] Fix Linux libbt-vendor build

Fix enumeration values not explicitly handled in switch;
Fix unused variables;
Fix int64 printf.

bt: Add wiimote pairing support

Change-Id: Ie1e9fa445cc1967679f3d74277df4c594fca5330

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

Add a missing OSI_NO_INTR() wrapper around socket read()

Also, print a better error message.

Change-Id: I22da05fd5e9b10a5122705105ea7a45855eb144d

Add missing include for OSI_NO_INTR

Fixes building bt_vendor_linux since
OSI_NO_INTR is defined in osi.h

Change-Id: Ib95a3126ed4a7b8f0bdc7db3dd2ef162825f2cbe
Signed-off-by: Stefan Stanacar <stefan.stanacar@intel.com>

vendor_libs: create Android.mk

all-subdir-makefiles call works for only one
nested sublevels, so we need to add a default
Android.mk in order to be able to build libbt-vendor module.

BUG=28014054

Change-Id: I7cc004d2a4dd6216a80d13c6384d9dcde328323e
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>

Fix Linux libbt-vendor build

Fix enumeration values not explicitly handled in switch;
Fix the undefined reference to functions from libosi.

Change-Id: I64ab3d57d1c4879ad47ae1a03f8996287877535d
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>

merge in nyc-mr1-release history after reset to nyc-mr1-dev

Android 7.0.0 Release 14 (NBD90Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz9GMACgkQ6K0/gZqxDniztACcCXYJhyKu/kYqT6b8cZ/1Ceau
AnEAnjcawrQlJbnI/BJC53f1MmlMmRu+
=jjbE
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/system/bt into cm-14.0

Android 7.0.0 Release 14 (NBD90Z)

Change-Id: I634414c79b6cb207d22bb29dfb2854e96ae77e46

bt: Fix HCI driver selection logic for Qualcomm Bluetooth

* Previously BT_SOC_SMD was the same as BT_SOC_DEFAULT, which
is no longer true.
* The iteration to determine SOC type only worked due to the specific
values of BT_SOC_DEFAULT and BT_SOC_SMD previously. Fix the iteration
to actually check all SOC types.

Change-Id: If282200737099d6587f3dc6fcd0a7e70b93996cb

Fix bad GATT client state machine state after successfull cache load

If the GATT service cache was successfully loaded from a file, the
state must be reset to idle.

Bug: 31175159
Change-Id: I92ebf1bec9d2e7467d7412b41923614ec5a13b6d