OSDN Git Service

android-x86/system-bt.git
6 years agoUse unary operator instead of == bool
Myles Watson [Mon, 9 Oct 2017 19:55:02 +0000 (19:55 +0000)]
Use unary operator instead of == bool
am: b749ebde2c

Change-Id: I61a1434e9fc7f86630b514aba6e0540937a1aa4c

6 years agoUse unary operator instead of == bool
Myles Watson [Fri, 6 Oct 2017 23:39:05 +0000 (16:39 -0700)]
Use unary operator instead of == bool

Automatically generated with coccinelle:

@@
expression e1;
@@

-e1 == false
+!e1

@@
expression e1;
@@

-false == e1
+!e1

@@
expression e1;
@@

-e1 == true
+e1

@@
expression e1;
@@

-true == e1
+e1

Test: build
Change-Id: Ic7df0dc43b550594855e457466b6bccd8f3443a3

6 years agoMerge "Remove the build team from OWNERS in system/bt"
Myles Watson [Fri, 6 Oct 2017 21:47:58 +0000 (21:47 +0000)]
Merge "Remove the build team from OWNERS in system/bt"
am: 9eb8abb9f8

Change-Id: Ibe8aa4f45105100087d3264596ef4ced4e6a96fc

6 years agoMerge "Remove the build team from OWNERS in system/bt"
Treehugger Robot [Fri, 6 Oct 2017 21:40:34 +0000 (21:40 +0000)]
Merge "Remove the build team from OWNERS in system/bt"

6 years agoMerge "Remove -Wno-typedef-redefinition"
Myles Watson [Fri, 6 Oct 2017 20:39:05 +0000 (20:39 +0000)]
Merge "Remove -Wno-typedef-redefinition"
am: 17927cfa5e

Change-Id: I3e722cfa3d85d87c0dee9cd27b0801cf22acbda9

6 years agoMerge "Remove -Wno-typedef-redefinition"
Treehugger Robot [Fri, 6 Oct 2017 20:27:29 +0000 (20:27 +0000)]
Merge "Remove -Wno-typedef-redefinition"

6 years agoRemove the build team from OWNERS in system/bt
Myles Watson [Thu, 5 Oct 2017 23:21:51 +0000 (16:21 -0700)]
Remove the build team from OWNERS in system/bt

Test: build
Change-Id: I17f1fa9c0b5cdf4dc871c54f5731371f6828255c

6 years agoUse -Werror in system/bt/vendor_libs/linux/interface/
Chih-Hung Hsieh [Fri, 6 Oct 2017 01:21:25 +0000 (01:21 +0000)]
Use -Werror in system/bt/vendor_libs/linux/interface/
am: ad01e9a992

Change-Id: Id6411c4c3f5929b47103f3c2550b4a13d5ca9b42

6 years agoRemove -Wno-typedef-redefinition
Myles Watson [Thu, 5 Oct 2017 23:38:11 +0000 (16:38 -0700)]
Remove -Wno-typedef-redefinition

Test: build
Change-Id: I42cc5ad8f77061bdce8906f7e454c8120f4e71b2

6 years agoUse -Werror in system/bt/vendor_libs/linux/interface/
Chih-Hung Hsieh [Mon, 2 Oct 2017 22:48:17 +0000 (15:48 -0700)]
Use -Werror in system/bt/vendor_libs/linux/interface/

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I2eca0a5fff52c83a86b060fd274c5a4cd1c53664

6 years agoMerge "Decrese the default verbosity for A2DP codec info logs"
Pavlin Radoslavov [Thu, 5 Oct 2017 01:59:52 +0000 (01:59 +0000)]
Merge "Decrese the default verbosity for A2DP codec info logs"
am: c25f957c7f

Change-Id: I4d2956a8f87088e52968a48e06a92fa1dde1dbb9

6 years agoMerge "Decrese the default verbosity for A2DP codec info logs"
Treehugger Robot [Thu, 5 Oct 2017 01:51:14 +0000 (01:51 +0000)]
Merge "Decrese the default verbosity for A2DP codec info logs"

6 years agoMerge "Added extra A2DP logging when there is an error"
Pavlin Radoslavov [Thu, 5 Oct 2017 01:46:04 +0000 (01:46 +0000)]
Merge "Added extra A2DP logging when there is an error"
am: 81e9b33cdf

Change-Id: Ibee8229736a8d50aeb79a5e39a33ea7339c85692

6 years agoMerge "Added extra A2DP logging when there is an error"
Treehugger Robot [Thu, 5 Oct 2017 01:39:45 +0000 (01:39 +0000)]
Merge "Added extra A2DP logging when there is an error"

6 years agoMerge "Fix net_test_bluetooth"
Jakub Pawlowski [Thu, 5 Oct 2017 01:32:23 +0000 (01:32 +0000)]
Merge "Fix net_test_bluetooth"
am: 936980bf40

Change-Id: I1e95b2748fc9fc589e6c82636f5d2fb5597f57f3

6 years agoMerge "Fix net_test_bluetooth"
Treehugger Robot [Thu, 5 Oct 2017 01:25:42 +0000 (01:25 +0000)]
Merge "Fix net_test_bluetooth"

6 years agoDecrese the default verbosity for A2DP codec info logs
Pavlin Radoslavov [Wed, 4 Oct 2017 18:26:04 +0000 (11:26 -0700)]
Decrese the default verbosity for A2DP codec info logs

Bug: 64159791
Test: Manual
Change-Id: Ida10f5d2aa6643df136a41891d7775e175c06570
(cherry picked from commit b4ae75f4524fd5bf55d015f860f1deaee0d81f43)

6 years agoAdded extra A2DP logging when there is an error
Pavlin Radoslavov [Wed, 4 Oct 2017 12:36:25 +0000 (05:36 -0700)]
Added extra A2DP logging when there is an error

Bug: 64159791
Test: Manual
Change-Id: Ic1001892b7abc9784a21a183d141df51b1b92fc0
(cherry picked from commit 6c6d2f6a14847ee75c72b1366449c45ab66feb00)

6 years agobtm: Return the result in btm_pm_compare_modes
Myles Watson [Wed, 4 Oct 2017 23:47:00 +0000 (23:47 +0000)]
btm: Return the result in btm_pm_compare_modes
am: 13538385f4

Change-Id: I0c2aee751cb58c9e89ded941b7359ddd9f4a38cb

6 years agoFix net_test_bluetooth
Jakub Pawlowski [Wed, 4 Oct 2017 23:01:26 +0000 (16:01 -0700)]
Fix net_test_bluetooth

Test: net_test_bluetooth
Change-Id: I8c84f0db3ce0e4f6efbd6d7d3cdc794be8fb7faa

6 years agobtm: Return the result in btm_pm_compare_modes
Myles Watson [Tue, 3 Oct 2017 23:51:30 +0000 (16:51 -0700)]
btm: Return the result in btm_pm_compare_modes

Test: build
Bug: 67383347
Change-Id: Id4407c1a73592674f0d86b1be1152abc088908b5

6 years agoUse std::list in GATT related code
Jakub Pawlowski [Wed, 4 Oct 2017 18:33:04 +0000 (18:33 +0000)]
Use std::list in GATT related code
am: d9ca4100b8

Change-Id: Ic62a1be3f450695bfaa649c6f39f451c9907102f

6 years agoUse std::list in GATT related code
Jakub Pawlowski [Sat, 9 Sep 2017 19:50:38 +0000 (12:50 -0700)]
Use std::list in GATT related code

Bug: 67057055
Test: sl4a Gatt* tests
Change-Id: I8201ebdad5ba4c3d5d0a2fd3d0fe9dc900b51d60

6 years agoMerge "Run clang format on files touched by CL 488398"
Myles Watson [Wed, 4 Oct 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Run clang format on files touched by CL 488398"
am: 3494410e02

Change-Id: Id4fe99fb0e84b2b5a80401c73ebc704fd4c6cb10

6 years agoA2DP: Advance btif profile queue on OPENING->other_state transition
Jack He [Wed, 4 Oct 2017 17:37:39 +0000 (17:37 +0000)]
A2DP: Advance btif profile queue on OPENING->other_state transition
am: a362647758

Change-Id: I322c3ef42b38106a7cb1206b7e1c02dac79c3aa5

6 years agoHandle Disconnect request in AV Opening State handler
c_sdamga [Wed, 4 Oct 2017 17:36:25 +0000 (17:36 +0000)]
Handle Disconnect request in AV Opening State handler
am: ff1b9d26ca

Change-Id: I508456cc74a52b61ca0aadcde5d39588fcebb861

6 years agoMerge "Run clang format on files touched by CL 488398"
Treehugger Robot [Wed, 4 Oct 2017 17:22:17 +0000 (17:22 +0000)]
Merge "Run clang format on files touched by CL 488398"

6 years agoA2DP: Advance btif profile queue on OPENING->other_state transition
Jack He [Mon, 2 Oct 2017 21:07:33 +0000 (14:07 -0700)]
A2DP: Advance btif profile queue on OPENING->other_state transition

* Entering BTIF_AV_STATE_OPENING is only possible through
  BTIF_AV_CONNECT_REQ_EVT (initiated by us) OR
  BTA_AV_PENDING_EVT (initiated by remote)
  from BTIF_AV_STATE_IDLE
* If we go from BTIF_AV_CONNECT_REQ_EVT, we must have a pending
  connection request in btif_profile_queue that should be advanced when
  we quit BTIF_AV_STATE_OPENING state
* This CL adds a flag to indicate whether an AV connection is initiated
  by us and only advance queue when it is
* Also add queue advancement in BTA_AV_REJECT_EVT and BTA_AV_CLOSE_EVT

Bug: 67317954
Test: make
Change-Id: I16dc8ebf76c6edaacb1f7a4a44e604170ff9a8b0

6 years agoHandle Disconnect request in AV Opening State handler
c_sdamga [Mon, 20 Jul 2015 13:47:04 +0000 (19:17 +0530)]
Handle Disconnect request in AV Opening State handler

Usecase:
1. Uncheck media from settings UI
2. initiate A2dp connection from remote, send AVRCP play from remote

Failure:
A2dp connection stuck in opening state.

Rootcause:
When A2dp is unchecked from settings UI and remote initiated
a2dp connection and AVRCP play, music starts streaming on DUT
since A2dp connection disconnected. As A2dp connection was not
completed, btif state stuck in opening state.

Fix:
Handled the disconnection request in the opening state
so that AV state machine moves to proper state before
processing AVRCP Play.

Test: 1. Uncheck media from settings UI
2. initiate A2dp connection from remote, send AVRCP play

Bug: 35415160
Change-Id: If1cda5b78100419fdc60c97349efafdd4a18d40c

6 years agoRun clang format on files touched by CL 488398
Myles Watson [Tue, 19 Sep 2017 17:01:28 +0000 (10:01 -0700)]
Run clang format on files touched by CL 488398

https://android-review.googlesource.com/#/c/488398/

Test: build
Change-Id: Iefbd5b632087be00a12b1a0c851f9e3f3b514532

6 years agoFix adv instance validity check during suspend and resume of resolving list
Subramanian Srinivasan [Tue, 3 Oct 2017 19:31:12 +0000 (19:31 +0000)]
Fix adv instance validity check during suspend and resume of resolving list
am: 2e08795a89

Change-Id: I8a0b390c60ab2ef35407931e4e6baf56cddcfd69

6 years agoFix adv instance validity check during suspend and resume of resolving list
Subramanian Srinivasan [Fri, 29 Sep 2017 01:41:03 +0000 (18:41 -0700)]
Fix adv instance validity check during suspend and resume of resolving list

When BT is shutdown, multi advertisement instance pointer is made
null by BleAdvertisingManager::CleanUp function.
Any subsequent BleAdvertisingManager::Get function call made at
this point(eg during suspension and resumption of resolving list
activity)leads to a crash as the instance pointer is null.
Hence, use BleAdvertisingManager::IsInitialized function instead
of BleAdvertisingManager::Get function to check the validity of
multi advertisement instance.

Bug: 67325491
Change-Id: Ibbae7fa546bb52494be78eaff6d4b7b15614ab15

6 years agoAdd comments to function arrays to indicate usage
Stanley Tng [Tue, 3 Oct 2017 16:54:52 +0000 (16:54 +0000)]
Add comments to function arrays to indicate usage
am: 5af6abaf2e

Change-Id: Ic9672ec4fe12571004355735105a0a820f2159d4

6 years agoAdd comments to function arrays to indicate usage
Stanley Tng [Fri, 29 Sep 2017 16:01:25 +0000 (09:01 -0700)]
Add comments to function arrays to indicate usage

No logic change. More comments are added to function arrays to indicate
how each array entry are used.

Test: Manual
Change-Id: I59283cb9786da6f3a4b8a4b36e36e79a25ca6cb8

6 years agoMerge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
Dan Willemsen [Tue, 3 Oct 2017 02:54:53 +0000 (02:54 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am: 092fdf13ec

Change-Id: Ifbc8f21a19347ae08dfc4a04d3a7dcc9e890f3fc

6 years agoMerge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
Dan Willemsen [Tue, 3 Oct 2017 02:30:06 +0000 (02:30 +0000)]
Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"

6 years agoMerge "HID: Free process_repage_timer to prevent leak"
Hemant Gupta [Mon, 2 Oct 2017 23:24:37 +0000 (23:24 +0000)]
Merge "HID: Free process_repage_timer to prevent leak"
am: 4a8ff03328

Change-Id: Ib962c89810306be308f9b6fc48f0404e98b6965d

6 years agoMerge "HID: Free process_repage_timer to prevent leak"
Treehugger Robot [Mon, 2 Oct 2017 23:02:56 +0000 (23:02 +0000)]
Merge "HID: Free process_repage_timer to prevent leak"

6 years agoAdd more logs for Bluetooth connection errors
Stanley Tng [Mon, 2 Oct 2017 18:34:32 +0000 (18:34 +0000)]
Add more logs for Bluetooth connection errors
am: a712d14638

Change-Id: I86ea947f8ced69263a08f4f9cdd55daf4f9fa8bf

6 years agoHID: Free process_repage_timer to prevent leak
Hemant Gupta [Wed, 13 Sep 2017 12:05:03 +0000 (17:35 +0530)]
HID: Free process_repage_timer to prevent leak

Usecase:
1) Perform BT on/off stress test
2) Check for memory leakage in code in subsequent BT on/off usecase

Expectation
No memory leak during BT on/off stress test

Observed result
Memory leakage in hid code where alarm process_repage_timer is not freed
and only cancelled

Fix:
Free alarm process_repage_timer during HID Host deregstration

Test: Checked with BT on/off usecase, and alarm process_repage_timer is now
freed in every BT on/off usecase.

Bug: 65657207
Change-Id: Iccecd126716a5660f4c37ddc917bacee84342297

6 years agoRename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
Dan Willemsen [Mon, 2 Oct 2017 17:41:11 +0000 (10:41 -0700)]
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]

In the future, target.linux will apply to all targets running a linux kernel
(android, linux_glibc, linux_bionic). So move all current users to the specific
linux_glibc.

There will be another cleanup pass later that will move some instances back to
target.linux if the properties should be shared with target.android and
target.linux_bionic, but target.linux needs to be removed first.

Test: out/soong/build.ninja identical before/after
Change-Id: Iadc1ba324e03fd2b1b52bf471ffa2a71e0ec3e61
Exempt-From-Owner-Approval: build system cleanup

6 years agoAdd more logs for Bluetooth connection errors
Stanley Tng [Thu, 28 Sep 2017 19:55:41 +0000 (12:55 -0700)]
Add more logs for Bluetooth connection errors

Test: manual
Change-Id: I63402ee8ffa8f57a70a9c9aaa0370d8ca599bbea

6 years agoMerge "Remove unused events handler for BLE scan clients"
Jakub Pawlowski [Fri, 29 Sep 2017 23:27:57 +0000 (23:27 +0000)]
Merge "Remove unused events handler for BLE scan clients"
am: 509e6a2c74

Change-Id: If141f51dec219c5e352c628304969376a339dfde

6 years agoMerge "Remove unused events handler for BLE scan clients"
Treehugger Robot [Fri, 29 Sep 2017 23:17:41 +0000 (23:17 +0000)]
Merge "Remove unused events handler for BLE scan clients"

6 years agoRemove casts to (tBTA_GATTC*) unions to avoid unaligned accesses
Pavlin Radoslavov [Fri, 29 Sep 2017 22:05:24 +0000 (22:05 +0000)]
Remove casts to (tBTA_GATTC*) unions to avoid unaligned accesses
am: b147c652e9

Change-Id: Icc5d3a3b875c1f710f0a07c3c0c93aa134f272b5

6 years agoMerge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""
Pavlin Radoslavov [Fri, 29 Sep 2017 22:03:40 +0000 (22:03 +0000)]
Merge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""
am: 0ad77074e0

Change-Id: I458693e4cc88d3b9cac7425d4321a1a0b5ee0fb4

6 years agoRemove casts to (tBTA_GATTC*) unions to avoid unaligned accesses
Pavlin Radoslavov [Fri, 29 Sep 2017 01:11:06 +0000 (18:11 -0700)]
Remove casts to (tBTA_GATTC*) unions to avoid unaligned accesses

Bug: 65381426
Test: unit tests
Change-Id: I37e89ec7187ab1c61be4c736385a9fc5ec88d737

6 years agoMerge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""
Pavlin Radoslavov [Fri, 29 Sep 2017 21:44:59 +0000 (21:44 +0000)]
Merge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""

6 years agoMerge "UUID fix string parsing"
Jakub Pawlowski [Fri, 29 Sep 2017 21:17:19 +0000 (21:17 +0000)]
Merge "UUID fix string parsing"
am: 655c74d5bd

Change-Id: I21c340293b72128d52dfd8006eaa577cbc1b9435

6 years agoMerge "UUID fix string parsing"
Treehugger Robot [Fri, 29 Sep 2017 21:07:57 +0000 (21:07 +0000)]
Merge "UUID fix string parsing"

6 years agoRemove unused events handler for BLE scan clients
Jakub Pawlowski [Fri, 29 Sep 2017 20:48:38 +0000 (13:48 -0700)]
Remove unused events handler for BLE scan clients

These events should be handled only for GATT clients, not for BLE
scanner.

Bug: 67058417
Test: compilation
Change-Id: I70744d3c6fd7eb40d839863f7413a7521ca0b2e9

6 years agoRevert "Fix stack-buffer-overflow in bluetooth service GATT client"
Pavlin Radoslavov [Fri, 29 Sep 2017 00:30:13 +0000 (17:30 -0700)]
Revert "Fix stack-buffer-overflow in bluetooth service GATT client"

Instead of a calling site fix, a fix will be added to the called
function instead.

This reverts commit 998f78519d4ca9aad5a7105c8064c6a08342e98c.

6 years agoUUID fix string parsing
Jakub Pawlowski [Fri, 29 Sep 2017 19:11:42 +0000 (12:11 -0700)]
UUID fix string parsing

Instead of making assumption about null termination to make sure proper
number of characters were consumed in sscanf, just ask it to provide the
total number of characters parsed

Test: unittest net_test_types net_test_storage
Change-Id: I2a71c6a15774f73e0ed294d2646884e768ff30d2

6 years agoRemove default libraries
Dan Willemsen [Fri, 29 Sep 2017 04:58:08 +0000 (04:58 +0000)]
Remove default libraries
am: 3f02f4791b

Change-Id: I4d3aa9d9116ac915a088647496d1b564bcac8d76

6 years agoFix condition of adding device to resloving list
Chao Quan [Fri, 29 Sep 2017 03:23:57 +0000 (03:23 +0000)]
Fix condition of adding device to resloving list
am: 6738c83f8e

Change-Id: If04697a1d9e5e59426183a7284922d78dc1be018

6 years agoRefactor btm_ble_resolving_list_load_dev
Chao Quan [Fri, 29 Sep 2017 03:23:52 +0000 (03:23 +0000)]
Refactor btm_ble_resolving_list_load_dev
am: 06d4a42ac2

Change-Id: Ie015e1f0876aebafedcb04e8770cb0edd16f6f7f

6 years agoRemove default libraries
Dan Willemsen [Fri, 29 Sep 2017 00:12:28 +0000 (17:12 -0700)]
Remove default libraries

libdl is part of system_shared_libs now. -ldl -lpthread -lm are now defaults
for host_ldlibs on Linux and Darwin. -lrt is a default for host_ldlibs on
Linux.

Test: m host
Change-Id: Ie87f6ff4290d18e099e1be92093b86f743296563
Exempt-From-Owner-Approval: build system cleanup

6 years agoFix condition of adding device to resloving list
Chao Quan [Thu, 28 Sep 2017 17:15:32 +0000 (10:15 -0700)]
Fix condition of adding device to resloving list

Initial conditions:
1. A phone with a bt controller which doesn't support LE
privacy feature.
2. A HOGP mouse which doesn't exchange identity informatin
(IRK & indentity address)to phone
Reproduce procedure:
1. phone pair with mouse.
2. Disconnect profile link to mouse.
3. re-initiate connect to mouse.
Result: Can't connect to mouse

After bond done, stack will try to add the bonded device
to resolving list. But in the condition that controller
doesn't support LE privacy, stack adds a record with a dummy
static address. When re-initiate connection to this device,
stack will use this dummy static address, and connection
fail.

Fix the related condition

Test: manual
Change-Id: I82621c57c54667294912d4270be10299e8029b4a

6 years agoRefactor btm_ble_resolving_list_load_dev
Chao Quan [Fri, 11 Aug 2017 03:30:59 +0000 (11:30 +0800)]
Refactor btm_ble_resolving_list_load_dev

Test: compilation
Change-Id: I69fd4d9df63801bcc8b529d95bee74fd06c86249

6 years agoMerge "HIDD: Auto-plug and accept incoming connections"
Ivan Podogov [Thu, 28 Sep 2017 04:20:28 +0000 (04:20 +0000)]
Merge "HIDD: Auto-plug and accept incoming connections"
am: 34b1bed0d2

Change-Id: Ie83a77c83959d83b60e7e1eabbb08e886c4188a0

6 years agoMerge "HIDD: Auto-plug and accept incoming connections"
Treehugger Robot [Thu, 28 Sep 2017 04:16:02 +0000 (04:16 +0000)]
Merge "HIDD: Auto-plug and accept incoming connections"

6 years agoFix Linux build
Jack He [Thu, 28 Sep 2017 03:25:47 +0000 (03:25 +0000)]
Fix Linux build
am: fd45611d6c

Change-Id: Iec5f76d31645149f7b81a0f695e808a6ec19a260

6 years agoFix Linux build
Jack He [Thu, 28 Sep 2017 01:25:56 +0000 (18:25 -0700)]
Fix Linux build

* UUID source files
* L2CAP UCD source files

Test: build on linux
Change-Id: Iba6d8d082612c62e5a8d552140c86ed242da0e36

6 years agoMerge "Don't set CT2 bit when talking to pre-5.0 devices"
Jakub Pawlowski [Thu, 28 Sep 2017 01:07:48 +0000 (01:07 +0000)]
Merge "Don't set CT2 bit when talking to pre-5.0 devices"
am: 88f7ae508d

Change-Id: I1d1f343ea5fffa7312662670f30079ff7ea9bce9

6 years agoMerge "Don't set CT2 bit when talking to pre-5.0 devices"
Treehugger Robot [Thu, 28 Sep 2017 01:01:30 +0000 (01:01 +0000)]
Merge "Don't set CT2 bit when talking to pre-5.0 devices"

6 years agoFix out-of-bounds reading when copy SDP raw data
Yamei Du [Thu, 28 Sep 2017 00:19:30 +0000 (00:19 +0000)]
Fix out-of-bounds reading when copy SDP raw data
am: 04da67a727

Change-Id: I7b26a6a14ff83632e6f4fe9ad3f0a0a8af80fada

6 years agoDon't set CT2 bit when talking to pre-5.0 devices
Jakub Pawlowski [Wed, 27 Sep 2017 22:41:13 +0000 (15:41 -0700)]
Don't set CT2 bit when talking to pre-5.0 devices

Prior to 5.0 spec, CT2 bit in AuthReq was reserved. Setting it cause
bonding failure with devices that handle it incorrectly.

Bug: 66179701
Bug: 66931978
Test: Bond with device that have 4.2 chip
Change-Id: Idbbf2c39c499698844218059a35cb686996c136a

6 years agoFix out-of-bounds reading when copy SDP raw data
Yamei Du [Sat, 27 May 2017 02:41:42 +0000 (10:41 +0800)]
Fix out-of-bounds reading when copy SDP raw data

When no attribute is returned in the SDP response, the cpy_len will be
MAX_DISC_RAW_DATA_BUF, this will cause out-of-bonds reading of source
buffer when copy the response raw data.

Change-Id: I923d8ee7e08f935e13cec38b75a04beca6174452

6 years agoSMP: Use tSMP_INT_DATA instead of void
Myles Watson [Wed, 27 Sep 2017 21:13:21 +0000 (21:13 +0000)]
SMP: Use tSMP_INT_DATA instead of void
am: 5ce55bd2e0

Change-Id: I1f1ff8a75d6766a5b7a7fc0a0d9a100bf5d4a9a4

6 years agoSMP: Use tSMP_INT_DATA instead of void
Myles Watson [Wed, 20 Sep 2017 23:41:19 +0000 (16:41 -0700)]
SMP: Use tSMP_INT_DATA instead of void

Test: pairing sanity
Change-Id: Ie3a2f94ddd718344219760cef7f1477bd4d09e00

6 years agoHIDD: Auto-plug and accept incoming connections
Ivan Podogov [Tue, 26 Sep 2017 10:42:41 +0000 (11:42 +0100)]
HIDD: Auto-plug and accept incoming connections

Linux, Windows, and OSX try to connect with HID devices during
pairing. We should auto-plug and accept incoming connections if
there is currently no device connected.

In case of Windows, if it fails to connect the first time right
after pairing, all future connections are guaranteed to fail:
hangs in the "response pending" state at L2CAP connection, right
after SECURITY_COMPLETE, looks like a bug in Windows stack.

Since we always have a plugged, "in_use" device in registered
state, we won't be able to accept a new incoming connection,
unless we don't have any other paired device at all. This check
should be removed to allow smoother pairing experience and fix
Windows compatibility.

Bug: 66940516
Test: manual, with a test app
Change-Id: Ie6ca639cb120b52f59880fadb4d3654a095664d6

6 years agoL2CAP: Remove UCD related flags
Jack He [Wed, 27 Sep 2017 20:09:24 +0000 (20:09 +0000)]
L2CAP: Remove UCD related flags
am: 3992f45f86

Change-Id: I9e040eafa6fb526e32d360c318913454ab2b715d

6 years agoMerge "Modify Bluetooth Class of Device from Android stack"
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:43 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am: d98dac4396

Change-Id: Ie7bb897b534f65503cd626c6c958a16e6b3a7209

6 years agoL2CAP: Remove UCD related flags
Jack He [Thu, 21 Sep 2017 00:06:42 +0000 (17:06 -0700)]
L2CAP: Remove UCD related flags

* L2CAP UCD (Unicast Connectionless Data) is no longer enabled on the
  stack
* L2CAP_UCD_INCLUDED is always FALSE, the TRUE case should be removed
* As result, L2CAP_UCD_MTU, L2CAP_UCD_IDLE_TIMEOUT, and
  L2CAP_UCD_CH_PRIORITY need to be removed as well

Bug: 66244184
Test: build
Change-Id: Ieee8b3a547653efa3a34a0810c415ba4c32f1be7

6 years agoMerge "Modify Bluetooth Class of Device from Android stack"
Treehugger Robot [Wed, 27 Sep 2017 19:43:18 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"

6 years agoMerge "Fix GATT Characteristic discovery (server side)"
Jakub Pawlowski [Wed, 27 Sep 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Fix GATT Characteristic discovery (server side)"
am: 1c0dae6145

Change-Id: Ic0dc0eb7f321db75fd0bfc90bff9423a7b1147c0

6 years agoMerge "Fix GATT Characteristic discovery (server side)"
Treehugger Robot [Wed, 27 Sep 2017 18:55:30 +0000 (18:55 +0000)]
Merge "Fix GATT Characteristic discovery (server side)"

6 years agoRemove casts to unions to avoid unaligned accesses
Myles Watson [Wed, 27 Sep 2017 17:28:19 +0000 (17:28 +0000)]
Remove casts to unions to avoid unaligned accesses
am: 8d749047a0

Change-Id: Ib7bd6211720191bcc0dcbfeb2dcb5495fb55cad8

6 years agoFix GATT Characteristic discovery (server side)
Jakub Pawlowski [Wed, 27 Sep 2017 16:58:46 +0000 (09:58 -0700)]
Fix GATT Characteristic discovery (server side)

The pointer was not properly incremented, which resulted in trashes
being sent during GATT discovery.

This issue was introduced in commit
819e2ecb84a22d6e03ec9ed67b3260c0dd7e8aba (Use one type for UUID)

Bug: 66912853
Test: sl4a GATT read test
Change-Id: Ib57ad050ff17852f9b2fec9c51cad246235e3e80

6 years agoModify Bluetooth Class of Device from Android stack
Pulkit Bhuwalka [Thu, 14 Sep 2017 02:25:31 +0000 (19:25 -0700)]
Modify Bluetooth Class of Device from Android stack

Adds ability to modify Bluetooth Class of Device from Android stack by
hooking into existing functions to modify adapter properties. This
ensures the hardware HAL bluetooth.h interface does not have to change.

Bug: 36015415
Test: Modified Class of Device using sample app and verified device icon
change when discovering from a remote device.

Change-Id: Ib5f05741480a27431afea882d071ded4a6b1bdb8

6 years agoRemove casts to unions to avoid unaligned accesses
Myles Watson [Tue, 19 Sep 2017 17:01:28 +0000 (10:01 -0700)]
Remove casts to unions to avoid unaligned accesses

Bug: 65392204
Test: sanity
Change-Id: I2886cc02289b68710e83147ba4d7715a32a4fc55

6 years agoRemove unnecesary BTA redefinitions for GATT part 4
Jakub Pawlowski [Tue, 26 Sep 2017 23:08:15 +0000 (23:08 +0000)]
Remove unnecesary BTA redefinitions for GATT part 4
am: 50ba9031b4

Change-Id: Iec52c13db939ccfe3da63034661ef75fcde20265

6 years agoRemove unnecesary BTA redefinitions for GATT part 3
Jakub Pawlowski [Tue, 26 Sep 2017 23:08:11 +0000 (23:08 +0000)]
Remove unnecesary BTA redefinitions for GATT part 3
am: ee9a11f903

Change-Id: Ibc1c7a7586b6b1eda5f01be22bddc6447be79133

6 years agoRemove unnecesary BTA redefinitions for GATT part 2
Jakub Pawlowski [Tue, 26 Sep 2017 23:07:04 +0000 (23:07 +0000)]
Remove unnecesary BTA redefinitions for GATT part 2
am: e9ef00c3fb

Change-Id: I052607160b33ba78f153b68e018940d602e18254

6 years agoRemove unnecesary BTA redefinitions for GATT part 1
Jakub Pawlowski [Tue, 26 Sep 2017 23:07:00 +0000 (23:07 +0000)]
Remove unnecesary BTA redefinitions for GATT part 1
am: ab7a368f3f

Change-Id: Icb345dbfb20e26275cdb77e34f5d9e214d65eb03

6 years agoRemove unnecesary BTA redefinitions for GATT part 4
Jakub Pawlowski [Tue, 26 Sep 2017 15:45:20 +0000 (08:45 -0700)]
Remove unnecesary BTA redefinitions for GATT part 4

Test: compilation test
Change-Id: Ibe37a1c6506d567b68497e8c7074d90cd73ddf00

6 years agoRemove unnecesary BTA redefinitions for GATT part 3
Jakub Pawlowski [Tue, 26 Sep 2017 01:47:54 +0000 (18:47 -0700)]
Remove unnecesary BTA redefinitions for GATT part 3

Test: compilation test
Change-Id: I8d4b8cfd35fcb5ccd7067f1e02dedd1a58efa3ad

6 years agoRemove unnecesary BTA redefinitions for GATT part 2
Jakub Pawlowski [Tue, 26 Sep 2017 00:41:21 +0000 (17:41 -0700)]
Remove unnecesary BTA redefinitions for GATT part 2

Test: compilation test
Change-Id: Iaf81188596c33b92f79f163dc95187ed5c6f52a4

6 years agoRemove unnecesary BTA redefinitions for GATT part 1
Jakub Pawlowski [Tue, 26 Sep 2017 00:24:46 +0000 (17:24 -0700)]
Remove unnecesary BTA redefinitions for GATT part 1

Test: compilation test
Change-Id: I98ab63a187684ae4ffbb0cb23e5c9e67994be468

6 years agoBuild fix after UUID refactor for stage branch
Jakub Pawlowski [Tue, 26 Sep 2017 10:55:06 +0000 (10:55 +0000)]
Build fix after UUID refactor for stage branch
am: 30be4b9f9c

Change-Id: I65278615668f57dd0e3f91cfeb726ef291509ea2

6 years agoBuild fix after UUID refactor for stage branch
Jakub Pawlowski [Tue, 26 Sep 2017 05:19:01 +0000 (22:19 -0700)]
Build fix after UUID refactor for stage branch

Change-Id: Ia01fa17ba40d315a912c391211e101a951eab562

6 years agoresolve merge conflicts of 819e2ecb8 to stage-aosp-master
Jakub Pawlowski [Tue, 26 Sep 2017 00:10:29 +0000 (17:10 -0700)]
resolve merge conflicts of 819e2ecb8 to stage-aosp-master

Test: I tested this conflict resolution.
Change-Id: Id915d1a9011dba4b898d47f5e6d6546079733a4c

6 years agoUse one type for UUID (1/5)
Jakub Pawlowski [Mon, 10 Jul 2017 16:56:09 +0000 (09:56 -0700)]
Use one type for UUID (1/5)

Currently, we have few different representations for UUID in stack:
tBT_UUID, tSDP_UUID, bt_uuid_t, bluetooth:UUID, or uint8_t*.

Additionally, tBT_UUID and bt_uuid_t are used to hold UUID as 128bit
as Little Endian or Big Endian, depending on which part of stack (GATT
or SDP) is using it.

This patch is creating one type, bluetooth::Uuid, that will replace all
other types.

Bug: 66912853
Test: all sl4a tests for GATT and RFCOMM
Merged-In: Ia42d3233146db0488728ed6f878f99b368fe8838
Change-Id: Ia42d3233146db0488728ed6f878f99b368fe8838

6 years agoMerge "Get rid of unused _DYNAMIC_MEMORY"
Hansong Zhang [Fri, 22 Sep 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY"
am: 9c268d0a54

Change-Id: Ida1e0fb77241f26153648ea325284d39636ba8c2

6 years agoMerge "Get rid of unused _DYNAMIC_MEMORY"
Hansong Zhang [Fri, 22 Sep 2017 19:39:05 +0000 (19:39 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY"

6 years agoMerge "btlinux: Fix sepolicy for split policy (Treble) builds"
Rob Herring [Fri, 22 Sep 2017 18:39:01 +0000 (18:39 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds"
am: f0c8830387

Change-Id: I96784cd7c6aa31b3638edd27a6bc8437888a95a0

6 years agoMerge "btlinux: Fix sepolicy for split policy (Treble) builds"
Treehugger Robot [Fri, 22 Sep 2017 18:32:43 +0000 (18:32 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds"

6 years agoGet rid of unused _DYNAMIC_MEMORY
Hansong Zhang [Wed, 20 Sep 2017 16:31:32 +0000 (09:31 -0700)]
Get rid of unused _DYNAMIC_MEMORY

Removed the unused BTA_DYNAMIC_MEMORY and HID_DYNAMIC_LIBRARY

Bug: 27731905
Test: Manual
Change-Id: I6019584b165471c4058a2ec7ef8f278531153d18

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Fri, 22 Sep 2017 17:16:24 +0000 (17:16 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3
am: 6575e1630d

Change-Id: I7cd19034fd4bf513c4ec9a5b07b8ac5508651cd7

6 years agoBluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2)
Ajay Panicker [Fri, 22 Sep 2017 17:16:15 +0000 (17:16 +0000)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2)
am: 11b4d12b95

Change-Id: Idda00ee6b53c92c66a9ca4bbb0007319921f0f8a