OSDN Git Service
Jakub Pawlowski [Sun, 15 Oct 2017 03:00:13 +0000 (03:00 +0000)]
BTA GATT cache cleanup add_*_to_list
am:
0c3eaab266
Change-Id: I18c2579bbc19afb0b8b5f4777eb81e8d40ff90f3
Jakub Pawlowski [Sun, 15 Oct 2017 02:59:05 +0000 (02:59 +0000)]
BTA GATT cache cleanup bta_gattc_disc_res_cback
am:
e6389005a7
Change-Id: Ic7ab119635ad39b10aa93ac88a5fb588b60dc590
Jakub Pawlowski [Thu, 12 Oct 2017 21:42:11 +0000 (14:42 -0700)]
BTA GATT cache cleanup add_*_to_list
Bug:
67057055
Test: compilation test
Change-Id: If70cfc4c024434ffe77e53410b5de8f70af6b33e
Jakub Pawlowski [Thu, 12 Oct 2017 18:18:03 +0000 (11:18 -0700)]
BTA GATT cache cleanup bta_gattc_disc_res_cback
Bug:
67057055
Test: compilation test
Change-Id: Iccfffe5de654070058ce3f4af3f48fa0975b7cf3
Jakub Pawlowski [Thu, 12 Oct 2017 23:02:35 +0000 (23:02 +0000)]
make Uuid::kBase into local constexpr
am:
bf1ddfc833
Change-Id: I96ae73d0248a723f4015200ff06d74924b6d11c1
Jakub Pawlowski [Thu, 12 Oct 2017 20:29:04 +0000 (13:29 -0700)]
make Uuid::kBase into local constexpr
This fixes a bug where From128BitBE is used before kBase is initialized
Bug:
67671467
Test: Share a picture using Bluetooth
Change-Id: Ifb5b5f90dbca9646f117b9ff5d01439407424597
Jakub Pawlowski [Thu, 12 Oct 2017 20:19:14 +0000 (20:19 +0000)]
BTA GATT cache cleanup
am:
98c0494449
Change-Id: Id5ce319c71b20b1ea5dab99eaa7d204016203ed7
Jakub Pawlowski [Wed, 11 Oct 2017 21:55:15 +0000 (14:55 -0700)]
BTA GATT cache cleanup
This patch splits bta_gattc_add_attr_to_cache into two functions:
bta_gattc_add_descr_to_cache and bta_gattc_add_incl_srvc_to_cache
Bug:
67057055
Test: compilation test
Change-Id: I92702495e8631197e56c2cb0ab126b59cf7e90e4
Hansong Zhang [Thu, 12 Oct 2017 05:56:42 +0000 (05:56 +0000)]
Fix logs in btif_hh
am:
87279415b9
Change-Id: I86a707fbc2cc6ca7b104e7888a08d0a9cb8a1bc7
Hansong Zhang [Wed, 11 Oct 2017 23:43:53 +0000 (16:43 -0700)]
Fix logs in btif_hh
Fixed two logs which are incosistent with the actual error
Test: not needed.
Change-Id: I8937797148c8c71ef91f9fba5799192bf52692d8
Jakub Pawlowski [Wed, 11 Oct 2017 03:37:32 +0000 (03:37 +0000)]
Use LOG() macros in BTA GATT logging
am:
2647452211
Change-Id: Ie27ddfa6eb686ca5b5c8aad8691f01b82e891711
Jakub Pawlowski [Wed, 4 Oct 2017 19:22:10 +0000 (12:22 -0700)]
Use LOG() macros in BTA GATT logging
Test: compilation test
Change-Id: If7676af5bf915df57ab6e876d2f27500ebf5c07d
Jakub Pawlowski [Tue, 10 Oct 2017 19:55:59 +0000 (19:55 +0000)]
Merge "Linux: silence gnu-variable-sized-type-not-at-end warnings"
am:
a6244c79c5
Change-Id: Ieb61bef5ebcb170d1c2d8d0e92e65f32b6c654b5
Treehugger Robot [Tue, 10 Oct 2017 19:48:35 +0000 (19:48 +0000)]
Merge "Linux: silence gnu-variable-sized-type-not-at-end warnings"
Myles Watson [Tue, 10 Oct 2017 18:46:21 +0000 (18:46 +0000)]
Merge "HCI: Restart 5 seconds after an HCI timeout"
am:
6320a4b859
Change-Id: Iea13b72de3fdf0d02a7cba4052cb7e8baa8e0d4f
Treehugger Robot [Tue, 10 Oct 2017 18:33:10 +0000 (18:33 +0000)]
Merge "HCI: Restart 5 seconds after an HCI timeout"
Jakub Pawlowski [Tue, 10 Oct 2017 17:12:30 +0000 (10:12 -0700)]
Linux: silence gnu-variable-sized-type-not-at-end warnings
Test: compile on linux using ninja
Change-Id: If3fed35017e4aa8cfc2740b49eb4ff547b4e7e5f
Andre Eisenbach [Tue, 10 Oct 2017 12:34:32 +0000 (12:34 +0000)]
Change DI record default company ID to Google
am:
484d8e4f66
Change-Id: I02a44ccd7900c718f55603cff616165385ec8dd7
Andre Eisenbach [Tue, 10 Oct 2017 10:29:49 +0000 (03:29 -0700)]
Change DI record default company ID to Google
Test: manual
Change-Id: I181e9716dc2c9e48272dcc7f1a00841b4ed5c8dc
Jakub Pawlowski [Tue, 10 Oct 2017 06:14:49 +0000 (06:14 +0000)]
Linux build fix - include what you use
am:
7a7e8e963c
Change-Id: I58a6c891729c6ee5746dee249e39094e7540bc09
Jakub Pawlowski [Tue, 10 Oct 2017 03:53:39 +0000 (20:53 -0700)]
Linux build fix - include what you use
sys/uio.h should be included for writev
Change-Id: I1f66391d15109366356af09c825afa1216fbbf34
Jakub Pawlowski [Tue, 10 Oct 2017 03:53:51 +0000 (03:53 +0000)]
Fix linking error during stack startup
am:
6ea3e1418b
Change-Id: I8eb43d9919f70970627a22f10d1af6b5950859e8
Jakub Pawlowski [Mon, 9 Oct 2017 22:13:38 +0000 (15:13 -0700)]
Fix linking error during stack startup
Change-Id: I0ac207eada1ddf2181a4c2826ede74310ce119d1
Myles Watson [Mon, 9 Oct 2017 19:55:28 +0000 (19:55 +0000)]
Manually convert to unary where coccinelle could not
am:
5d5fcf26d9
Change-Id: Id59052d157cd09b5cf46298261a810c43e7f7fb7
Myles Watson [Mon, 9 Oct 2017 19:55:02 +0000 (19:55 +0000)]
Use unary operator instead of == bool
am:
b749ebde2c
Change-Id: I61a1434e9fc7f86630b514aba6e0540937a1aa4c
Myles Watson [Fri, 6 Oct 2017 23:51:21 +0000 (16:51 -0700)]
Manually convert to unary where coccinelle could not
Test: build
Change-Id: I7b5ea758b94bf225e8776f64256d644c3e96b198
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
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
Treehugger Robot [Fri, 6 Oct 2017 21:40:34 +0000 (21:40 +0000)]
Merge "Remove the build team from OWNERS in system/bt"
Myles Watson [Fri, 6 Oct 2017 20:39:05 +0000 (20:39 +0000)]
Merge "Remove -Wno-typedef-redefinition"
am:
17927cfa5e
Change-Id: I3e722cfa3d85d87c0dee9cd27b0801cf22acbda9
Treehugger Robot [Fri, 6 Oct 2017 20:27:29 +0000 (20:27 +0000)]
Merge "Remove -Wno-typedef-redefinition"
Myles Watson [Fri, 6 Oct 2017 18:22:51 +0000 (11:22 -0700)]
HCI: Restart 5 seconds after an HCI timeout
Bug:
67209266
Test: build
Change-Id: I69a4a17382742327268a80dbc5c5be49059ecb3c
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
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
Myles Watson [Thu, 5 Oct 2017 23:38:11 +0000 (16:38 -0700)]
Remove -Wno-typedef-redefinition
Test: build
Change-Id: I42cc5ad8f77061bdce8906f7e454c8120f4e71b2
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
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
Treehugger Robot [Thu, 5 Oct 2017 01:51:14 +0000 (01:51 +0000)]
Merge "Decrese the default verbosity for A2DP codec info logs"
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
Treehugger Robot [Thu, 5 Oct 2017 01:39:45 +0000 (01:39 +0000)]
Merge "Added extra A2DP logging when there is an error"
Jakub Pawlowski [Thu, 5 Oct 2017 01:32:23 +0000 (01:32 +0000)]
Merge "Fix net_test_bluetooth"
am:
936980bf40
Change-Id: I1e95b2748fc9fc589e6c82636f5d2fb5597f57f3
Treehugger Robot [Thu, 5 Oct 2017 01:25:42 +0000 (01:25 +0000)]
Merge "Fix net_test_bluetooth"
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)
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)
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
Jakub Pawlowski [Wed, 4 Oct 2017 23:01:26 +0000 (16:01 -0700)]
Fix net_test_bluetooth
Test: net_test_bluetooth
Change-Id: I8c84f0db3ce0e4f6efbd6d7d3cdc794be8fb7faa
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
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
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
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
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
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
Treehugger Robot [Wed, 4 Oct 2017 17:22:17 +0000 (17:22 +0000)]
Merge "Run clang format on files touched by CL 488398"
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
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
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
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
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
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
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
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
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]]"
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
Treehugger Robot [Mon, 2 Oct 2017 23:02:56 +0000 (23:02 +0000)]
Merge "HID: Free process_repage_timer to prevent leak"
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
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
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
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
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
Treehugger Robot [Fri, 29 Sep 2017 23:17:41 +0000 (23:17 +0000)]
Merge "Remove unused events handler for BLE scan clients"
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
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
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
Pavlin Radoslavov [Fri, 29 Sep 2017 21:44:59 +0000 (21:44 +0000)]
Merge "Revert "Fix stack-buffer-overflow in bluetooth service GATT client""
Jakub Pawlowski [Fri, 29 Sep 2017 21:17:19 +0000 (21:17 +0000)]
Merge "UUID fix string parsing"
am:
655c74d5bd
Change-Id: I21c340293b72128d52dfd8006eaa577cbc1b9435
Treehugger Robot [Fri, 29 Sep 2017 21:07:57 +0000 (21:07 +0000)]
Merge "UUID fix string parsing"
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
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.
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
Dan Willemsen [Fri, 29 Sep 2017 04:58:08 +0000 (04:58 +0000)]
Remove default libraries
am:
3f02f4791b
Change-Id: I4d3aa9d9116ac915a088647496d1b564bcac8d76
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
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
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
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
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
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
Treehugger Robot [Thu, 28 Sep 2017 04:16:02 +0000 (04:16 +0000)]
Merge "HIDD: Auto-plug and accept incoming connections"
Jack He [Thu, 28 Sep 2017 03:25:47 +0000 (03:25 +0000)]
Fix Linux build
am:
fd45611d6c
Change-Id: Iec5f76d31645149f7b81a0f695e808a6ec19a260
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
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
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"
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
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
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
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
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
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
Jack He [Wed, 27 Sep 2017 20:09:24 +0000 (20:09 +0000)]
L2CAP: Remove UCD related flags
am:
3992f45f86
Change-Id: I9e040eafa6fb526e32d360c318913454ab2b715d
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
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