OSDN Git Service
Pavlin Radoslavov [Thu, 13 Jul 2017 01:39:31 +0000 (18:39 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
(cherry picked from commit
9aea2c2f92dd5245f6b35d564ce8e471fec2b4ec)
(cherry picked from commit
3f2ee5b546b65b5b021779588316249276ed3827)
(cherry picked from commit
40c7cefb12ac1a70bf7b1c770c1ab21a5b3f229e)
(cherry picked from commit
f7a7f7a948e38195e8ca897785ac5d489082f0cc)
(cherry picked from commit
b40497b27a0dce81d11f0dca09af6d81abf4bd92)
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit
d88838a7237cd672d87b6b9cc8d56fff625fd1d5)
(cherry picked from commit
b648c7dfe45c57842d58576f558fdf8edff10bec)
(cherry picked from commit
338e0485940ab278e6a2dc12285ba0798b79cfa4)
(cherry picked from commit
510697a0d79ac9816c0e2717c357c3330d89645a)
Dan Pasanen [Mon, 7 Aug 2017 20:09:26 +0000 (15:09 -0500)]
Revert "Merge tag 'LA.UM.5.5.r1-05300-8x96.0' into cm-14.1"
This reverts commit
b30e393e03d2cf58b05257d4bdae5c6f910fa20d, reversing
changes made to
331fc1e269eeda17dd649c71115e49e97d2b16ba.
Change-Id: I6829ecb512561d2ba68adac3fe5353004e53b15b
Dan Pasanen [Thu, 27 Jul 2017 15:44:37 +0000 (10:44 -0500)]
Merge tag 'LA.UM.5.5.r1-05300-8x96.0' into cm-14.1
"LA.UM.5.5.r1-05300-8x96.0"
Change-Id: I694c157134399f72d9178d18e988a17f7fcc8814
Linux Build Service Account [Sun, 9 Jul 2017 08:13:48 +0000 (01:13 -0700)]
Merge
61578191af535415104b2b1a5c9b9691430d289a on remote branch
Change-Id: I1f6c956ffaff2b7429b50aafd63a35499e8d9391
Linux Build Service Account [Fri, 30 Jun 2017 08:29:57 +0000 (02:29 -0600)]
Promotion of bt.lnx.2.1.c1-00059.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2062337 I3ceea4f035a115985d692d30f39c3a0e4729a323 AV: Use separate AV sig timeout timer for dual connectio
Change-Id: I0b1df6756bec57a50812c07de2c9086aed68645d
CRs-Fixed:
2062337
CNSS_WLAN Service [Fri, 30 Jun 2017 07:28:47 +0000 (00:28 -0700)]
Merge "AV: Use separate AV sig timeout timer for dual connections." into bt.lnx.2.1.c1-dev
Linux Build Service Account [Fri, 23 Jun 2017 09:56:07 +0000 (03:56 -0600)]
Merge
e6ba9c4225b7639ce152017fa78356551d8756d8 on remote branch
Change-Id: Iffaf6d12087d527a6694cbc0221aaedb51ade44e
Linux Build Service Account [Mon, 19 Jun 2017 10:11:49 +0000 (04:11 -0600)]
Promotion of bt.lnx.2.1.c1-00058.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2005284 Ic1debdee4b2140eb6400fecbaacb5909fbce6535 BT : Introduced an internal queue in hci thread to hold
2033948 I43f47e61a31cf917a4ddc1a9e6c5c13a25f8730d SDP: Dont start SDP search with invalid BD Addr
Change-Id: I1ea61f551a23b1b36492188a1f6c177caca3f135
CRs-Fixed:
2005284,
2033948
Linux Build Service Account [Sat, 17 Jun 2017 03:21:52 +0000 (20:21 -0700)]
Merge "BT : Introduced an internal queue in hci thread to hold commands"
Sumit Bajpai [Wed, 14 Jun 2017 08:45:25 +0000 (14:15 +0530)]
AV: Use separate AV sig timeout timer for dual connections.
In dual a2dp connection scenario, if both remote devices
initiate connection at same time, DUT replaces AV signalling
timeout timer which started for 1st device when avdtp l2cap
sig channel was established with that of 2nd device when
its channel is established. In case remote1 doesn't start
AV signalling procedure hence, then DUT also fails to do
so as timer for remote1 was lost. The fix keeps two separate
timers for two connections.
Change-Id: I3ceea4f035a115985d692d30f39c3a0e4729a323
CNSS_WLAN Service [Fri, 16 Jun 2017 05:55:44 +0000 (22:55 -0700)]
Merge "SDP: Dont start SDP search with invalid BD Addr" into bt.lnx.2.1.c1-dev
Bandari Ramesh [Fri, 31 Mar 2017 12:45:00 +0000 (18:15 +0530)]
BT : Introduced an internal queue in hci thread to hold commands
- Added an internal queue to avoid making hci thread busy
due to unavailability of credits.
CRs-Fixed:
2005284
Change-Id: Ic1debdee4b2140eb6400fecbaacb5909fbce6535
Gabriele M [Mon, 12 Jun 2017 20:49:48 +0000 (22:49 +0200)]
bt: Disable AVRCP 1.6
Some car-kits won't display audio metadata if AVRCP 1.6 is enabled.
Disable it so that AVRCP 1.4 is instead used.
This change also fixes the build without AVRCP 1.5 and AVRCP 1.6
support enabled.
REGRESSION-130
Change-Id: I83323291a0f3a4dcfecb914a02b675366768059a
Linux Build Service Account [Sun, 11 Jun 2017 09:30:30 +0000 (03:30 -0600)]
Merge
0ebd2aa961dec52be53c255c47d478f0c52bbe48 on remote branch
Change-Id: I18ae4b4790902db3fe1bf0aff5ebd2db62780247
Linux Build Service Account [Fri, 9 Jun 2017 13:11:03 +0000 (07:11 -0600)]
Promotion of bt.lnx.2.1.c1-00057.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2050966 Id624f0eb656dc782948d14542e4d321abff4339f Fix: btapp will crash when pair request from both DUT &
2054878 Ied08635e3f786a175dab192a5aba069f33d3f36f RFCOMM: stop multiplexer disconnect timer while reconnec
Change-Id: I62ff1687eb03958327a1638c3eaa238eaaf6934c
CRs-Fixed:
2050966,
2054878
CNSS_WLAN Service [Fri, 9 Jun 2017 11:32:26 +0000 (04:32 -0700)]
Merge "Fix: btapp will crash when pair request from both DUT & Remote device simultaneously" into bt.lnx.2.1.c1-dev
Dan Pasanen [Mon, 5 Jun 2017 23:29:52 +0000 (18:29 -0500)]
Merge tag 'android-7.1.2_r17' into cm-14.1
Android 7.1.2 Release 17 (NJH47B)
# gpg: Signature made Fri 02 Jun 2017 05:09:10 PM CDT
# gpg: using DSA key
E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Tim Jiang [Tue, 23 May 2017 10:07:24 +0000 (06:07 -0400)]
Fix: btapp will crash when pair request from both DUT & Remote device simultaneously
Invalid p_rec_dev->p_callback pointer cause this issue.
CRs-Fixed:
2050966
Change-Id: Id624f0eb656dc782948d14542e4d321abff4339f
zhenchao [Thu, 18 May 2017 08:11:26 +0000 (16:11 +0800)]
RFCOMM: stop multiplexer disconnect timer while reconnect DLC
In very low rate, re-send file failed due to rfcomm multiplexer
disconnect timer timeout while reconnect RFCOMM DLC. During
reconnection, sender sent SABM to establish DLC and await UA.
But multiplexer disconnect timer of receiver timeout so that
rfcomm connection disconnect.
Change-Id: Ied08635e3f786a175dab192a5aba069f33d3f36f
CRs-Fixed:
2054878
Linux Build Service Account [Wed, 31 May 2017 06:40:50 +0000 (00:40 -0600)]
Promotion of bt.lnx.2.1.c1-00054.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2018001 I41682be1476d4c1c4ee58061407b94cfd2a2657a Cancel the link idle timer during gatt_connect
Change-Id: Idf3650c26fcb7032f701dc062925dd0f1f2dacaa
CRs-Fixed:
2018001
Linux Build Service Account [Tue, 30 May 2017 21:12:58 +0000 (14:12 -0700)]
Merge "Cancel the link idle timer during gatt_connect"
Linux Build Service Account [Sun, 28 May 2017 11:32:38 +0000 (05:32 -0600)]
Merge
02e8947d1008393252b9169c53a7be9319ff93ba on remote branch
Change-Id: I1806eda43ecaf15d5f5da047762a5fdbb318869b
Linux Build Service Account [Wed, 17 May 2017 09:20:35 +0000 (03:20 -0600)]
Promotion of bt.lnx.2.1.c1-00053.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2017829 I04ec116773bd8bfd033c76e9645acc06138b52e0 Fix time consuming doing Bluetooth OFF/ON while a2dp ste
2039987 Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4 resolve merge conflicts of
a3ee2e35 to nyc-dev
Change-Id: Ia9e80ba5c1eca5ac8efe68c6f7630540c0011086
CRs-Fixed:
2017829,
2039987
CNSS_WLAN Service [Wed, 17 May 2017 07:32:28 +0000 (00:32 -0700)]
Merge "Fix time consuming doing Bluetooth OFF/ON while a2dp steaming." into bt.lnx.2.1.c1-dev
Linux Build Service Account [Sat, 13 May 2017 11:39:27 +0000 (04:39 -0700)]
Merge "resolve merge conflicts of
a3ee2e35 to nyc-dev"
Linux Build Service Account [Fri, 12 May 2017 10:33:34 +0000 (04:33 -0600)]
Promotion of bt.lnx.2.1.c1-00052.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2038030 I7fdb0433353ba5793470313d205a68e8eb3fb5ac SDP: Add logic to downgrade PBAP version for blacklisted
2031104 Ic7f0bb53dce9fe1b72bf34c61c0b6ea3daf1e025 Configure correct remote MTU
1095999 I7bcff61d36249fd1a2d2101ec4745b7f7426fe0f Fix timestamp error in btsnoop log
Change-Id: I753581064525c4773fa11f12ed9fc0787412eb6a
CRs-Fixed:
1095999,
2031104,
2038030
Pavlin Radoslavov [Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
Bug:
34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit
1c6662b6263298b97122ab308d8dde1d5ed66ef7)
siminy [Tue, 25 Apr 2017 07:03:10 +0000 (15:03 +0800)]
SDP: Add logic to downgrade PBAP version for blacklisted device
As some remote devices go in bad state on parsing PBAP 1.2 SDP record.
Add them to PBAP version downgrade blacklist.Upgrade PBAP version
downgrade logic from to include name based blacklist and also remove
SDP attributes not suppported in PBAP 1.1 specifications like
GoepL2capPsm, SupportedFeatures.
CRs-Fixed:
2038030
Change-Id: I7fdb0433353ba5793470313d205a68e8eb3fb5ac
Linux Build Service Account [Mon, 8 May 2017 08:31:52 +0000 (02:31 -0600)]
Merge
4316cf4e1fc0e2dcb7cdc94eae2ae335c95a01fe on remote branch
Change-Id: I4f50eee012ed6105d0477957bf68e32e1ca8257a
juncao [Fri, 10 Mar 2017 08:19:15 +0000 (16:19 +0800)]
Fix time consuming doing Bluetooth OFF/ON while a2dp steaming.
When BT off, DUT send the avdtp suspend cmd to remote, at the same time
BT also do BREDR cleanup work, it shall make av state machine goes
into closing state. It will not repsonde to suspend response from remote,
hence the A2DP COMMND form audio HAL doesn't got ACK. The fix shall
ACK the pending command before clear the UIPC channel.
Change-Id: I04ec116773bd8bfd033c76e9645acc06138b52e0
CRs-Fixed:
2017829
Linux Build Service Account [Fri, 5 May 2017 11:19:49 +0000 (04:19 -0700)]
Merge "Fix timestamp error in btsnoop log"
Linux Build Service Account [Fri, 5 May 2017 11:19:48 +0000 (04:19 -0700)]
Merge "Configure correct remote MTU"
Timm Korte [Mon, 1 May 2017 16:05:50 +0000 (18:05 +0200)]
Do not include the trailing NULL from the C-String in the SDP service name
Change-Id: Ia9e589cafda38705ea1e1a163665d157748661b1
zhenchao [Thu, 1 Dec 2016 09:43:43 +0000 (17:43 +0800)]
Fix timestamp error in btsnoop log
Overflow occurs while caculate the time of packet arrival.
Type convert timestamp to 64-bit unsigned integer to avoid
overflow issue.
CRs-Fixed:
1095999
Change-Id: I7bcff61d36249fd1a2d2101ec4745b7f7426fe0f
Dan Pasanen [Mon, 1 May 2017 23:30:11 +0000 (18:30 -0500)]
Merge tag 'android-7.1.2_r8' into cm-14.1
Android 7.1.2 release 8
# gpg: Signature made Mon 01 May 2017 10:39:12 AM CDT
# gpg: using DSA key
E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Linux Build Service Account [Thu, 27 Apr 2017 20:19:51 +0000 (14:19 -0600)]
Promotion of bt.lnx.2.1.c1-00049.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2020549 I29cf2824d12a26aaedde31e156f1b7bf69af65e6 Fix HOGP report handling with HOGP devices
Change-Id: Ida529f2b6481183c814c5d28ac611f4c888f384e
CRs-Fixed:
2020549
Linux Build Service Account [Wed, 26 Apr 2017 17:42:17 +0000 (11:42 -0600)]
Promotion of bt.lnx.2.1.c1-00048.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2019703 I89720e636acf645a6cd9288a45ac543d7cd3da21 Double Audio stream output buffer size.
2019822 I227659b7e6973589c72c50af46a54878bdab5b32 check controller state before handling gatt client reque
2029615 Ie052c7ecafe4816a8c2fbc212a3b52a25b08543c Fix BLE stability issues when BT is being turned off
2029248 I1e54ded102d38cd42b3df40d405205a79b08928b uipc: retry to create srv chan if EADDRINUSE error
Change-Id: Ic2cf93a7a9f487d32090d71ba452a8865ac7cba2
CRs-Fixed:
2029615,
2029248,
2019703,
2019822
Linux Build Service Account [Wed, 26 Apr 2017 16:49:12 +0000 (09:49 -0700)]
Merge "Fix HOGP report handling with HOGP devices"
CNSS_WLAN Service [Wed, 26 Apr 2017 13:01:25 +0000 (06:01 -0700)]
Merge "uipc: retry to create srv chan if EADDRINUSE error" into bt.lnx.2.1.c1-dev
Pradeep Panigrahi [Thu, 16 Mar 2017 05:35:28 +0000 (11:05 +0530)]
check controller state before handling gatt client request.
Add change to ensure that controller interface is ready before
trying to handle client request for cleaning up the client
interface . This will fix stability issues,where assert is
happening while we try to access controller module before its ready.
CRs-fixed:
2019822
Change-Id: I227659b7e6973589c72c50af46a54878bdab5b32
CNSS_WLAN Service [Tue, 25 Apr 2017 10:22:30 +0000 (03:22 -0700)]
Merge "Fix BLE stability issues when BT is being turned off" into bt.lnx.2.1.c1-dev
Venkata Jagadeesh Garaga [Fri, 14 Apr 2017 09:35:01 +0000 (15:05 +0530)]
SDP: Dont start SDP search with invalid BD Addr
When any profile initiates SDP search with null bd addr
connection fails with page time out and SDP state machine
will stuck in search active state until bt reset.
Hence dont allow any service search with NULL bd addr
Change-Id: I43f47e61a31cf917a4ddc1a9e6c5c13a25f8730d
juncao [Tue, 25 Apr 2017 09:44:16 +0000 (17:44 +0800)]
Configure correct remote MTU
Remote MTU shall be configured to L2CAP_DEFAULT_MTU if
there is no MTU in configuration request
Change-Id: Ic7f0bb53dce9fe1b72bf34c61c0b6ea3daf1e025
CRs-Fixed:
2031104
android-build-team Robot [Fri, 21 Apr 2017 20:42:40 +0000 (20:42 +0000)]
Merge cherrypicks of [
2007123,
2089669,
2072002,
2094113,
1989895,
2094094,
2017568,
2054111,
2054025,
2074928,
2066476,
2092431,
2053944,
2095243,
2092549,
2065088,
2007730,
2008313,
2053983,
2025333,
2094716,
2026590,
2059276,
2089422,
2080090] into nyc-mr2-pixel-monthly-release
Change-Id: I15905521312ca9db242ef3eb65125df80b4a9275
Jack He [Thu, 6 Apr 2017 00:59:58 +0000 (17:59 -0700)]
Check LE advertising data length before caching advertising records
Change-Id: Ib14ee8aa165b11002cdf82f86a1e547854c98347
android-build-team Robot [Fri, 21 Apr 2017 17:31:09 +0000 (17:31 +0000)]
release-request-
762540b1-1728-41bc-a9ce-
e977f3e2683f-for-git_nyc-mr2-pixel-monthly-release-
3888830 snap-temp-L22300000056915770
Change-Id: I6bcb0d7906f30abb7a42947d5f93b12a335a3e82
android-build-team Robot [Thu, 20 Apr 2017 22:39:41 +0000 (22:39 +0000)]
Merge cherrypicks of [
2089422,
2053944,
2094094,
2007730,
2072002,
2065088,
1989895,
2080090,
2026590,
2008313,
2089669,
2059276,
2094716,
2066476,
2053983,
2007123,
2017568,
2054111,
2054025,
2095243,
2092431,
2092549,
2025333,
2099168,
2074928] into nyc-mr2-pixel-monthly-release
Change-Id: Ibcb6be2c5641ce560673032d48ecaf7b3055b5e9
Jack He [Thu, 6 Apr 2017 00:59:58 +0000 (17:59 -0700)]
Check LE advertising data length before caching advertising records
Change-Id: I9d34dceaead4dde72c36842af477758462cca67c
Pradeep Panigrahi [Thu, 30 Mar 2017 19:15:22 +0000 (00:45 +0530)]
Fix BLE stability issues when BT is being turned off
Incorporates the following changes to take care of BLE
stability issues:
1) Third party apps are not in sync with bluetooth adapter and
sometimes call gatt client/server calls while bluetooth is
turning off, causing assert. Add change to not process the
application request at btif, if the bluetooth adapter is not
ready or is turning off.
2) return max adv instance count as 0 if controller interface is
not ready.
Change-Id: Ie052c7ecafe4816a8c2fbc212a3b52a25b08543c
Okeer [Sat, 15 Apr 2017 15:38:10 +0000 (22:38 +0700)]
bt: fix build for non-BLE after the 7.1.2 merge
Add BLE guards to btm_use_preferred_conn_params() and partially to
btif_dm_create_bond_out_of_band().
Change-Id: I43d45ce58c98e7f2d4dd73bd4db7518372f07afd
Satheesh Kumar Pallemoni [Fri, 24 Mar 2017 11:37:15 +0000 (17:07 +0530)]
Double Audio stream output buffer size.
To align with the frame size, double Audio
stream output buffer size.
CRs-Fixed:
2019703
Change-Id: I89720e636acf645a6cd9288a45ac543d7cd3da21
Linux Build Service Account [Fri, 14 Apr 2017 08:47:18 +0000 (02:47 -0600)]
Promotion of bt.lnx.2.1.c1-00046.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
Ia79483c72d3b0cfc1e339f9f4ac65295e68e8e5d Add dumpsys support for LE connection parameter updates
I3c165843bb76c372b76bdc18a7d9226345d39037 Fix incorrect check for empty out-of-band pairing data
Iaf1b1dd746dd52ab7e50b870efacde2b8dd0bed6 DO NOT MERGE ANYWHERE Fix the timestamp in btsnoop forma
I73ad281437760e1d61dd4e504401b270eb77e3e6 DO NOT MERGE ANYWHERE LE Connection Parameter Update Cal
I1732be86dd888586c603112fb6c3010974b54a13 DO NOT MERGE ANYWHERE Add Wear-specific feature to overr
I7f8a052e78706c8c72c5102b38cfe9ce200ae0d9 Remove position dependent lookup tables in AT command pa
Ibd9301a990f12a94e8043b9c29a480f068251ba8 Fix how LE connection parameters are set after connectin
Ibd8f8b85eb59be8bfbb8a7c83b5935802624a748 Move btsnoop_hci.log to /data/misc/bluetooth/logs
Iea2a997c4ea074687a5d50860e9229f0e1b82659 Fix A2DP metrics session duration
Ic96205b5c304acb44eab53f4e2cb150726643bda Serialize stack shutdown, state change callback and clea
If2ca53c7b22a346e7236514ea7b461695c923f74 Cleanup GATT cache when remote device is disconnected
Ibe500e332dba8f44485b44bcac32d11be52520a6 Add extra logs by default inside sdp_copy_raw_data()
I27619098df33a641cb089b82cf4d4ffd3c6e6aea Fix NPE when discovering invalid GATT datatbase
I28cf4f6d5dcfb7a0bfb6aa652d939e16fbdcdcde DO NOT MERGE ANYWHERE Auto Connection Parameter Update f
I4bb3fb02cffdcc5b1273f8ace281826eccce6639 Improve HOGP input report error handling
Ide9dee819e1db24a39c05b086cd4c0b558ca23ef [DO NOT MERGE] Remove incorrect assert in btm_read_rssi_
I2cc6f9304725938b63b211d615eb1941eac60edf Fix A2DP Metrics Logging Capacity
I10984920afd4d77f07a5ac75736f8dcd69b13af8 Corrected default value assignments in Bluetooth A2DP Me
I216142090fe99b25ef7697fceceb278b761a182b Add LE Secure Connection data parsing (3/4)
I61f06a9d878dd72154d6621eb094dcea5f701cbc Assign pairing code to bta_dm_cb before device name reso
I683eccd53d40e79ec03545166b18ffa1922f0fb2 Fix HFP AT command BIA failures
Iac8684bdfd02b18cce260bedefb829e8f7285361 Mask out HFP 1.7 feature bits if peer version is <1.7
I7f8a052e78706c8c72c5102b38cfe9ce200ae0d9 Remove position dependent lookup tables in AT command pa
I51cb73666ac58e4792d9cba0d6f16dad30a0ff39 Add LeakyBondedQueue to libosi
Idc0315e9e3f9e17c3cf56fa483c8e21eb3590f01 BLE OOB Pairing - parse address type (1/5)
I4540230c792490f79e4cca24cb4b34a1c383422f DO NOT MERGE ANYWHERE Do not update sco_state when no ma
Change-Id: Iad5b862b89b66ceb0345caf8f5a3c0bf44b0c21c
Bharat Pawar [Wed, 5 Apr 2017 09:49:40 +0000 (15:19 +0530)]
N-MR2 N2G47H merge '
5a9925784a4a34811ae29608b67dee4a580c226b' - conflicts
Change-Id: Icc1ccd435f30b32723d218078bfedbca647c210d
Linux Build Service Account [Mon, 10 Apr 2017 08:06:58 +0000 (02:06 -0600)]
Merge
9ca51f4017a0605ee8ed59983fc7dab2d18ca3af on remote branch
Change-Id: Ib4b8ee6cf1526221dee645d6e5373e4f9850187a
Pavlin Radoslavov [Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
Bug:
34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
Arne Coucheron [Tue, 4 Apr 2017 23:59:46 +0000 (01:59 +0200)]
Merge tag 'android-7.1.2_r2' into cm-14.1
Change-Id: I6d14049f050ea0b25c74f82af86c23b57910f567
Mingbo Zhang [Tue, 28 Mar 2017 05:40:31 +0000 (13:40 +0800)]
uipc: retry to create srv chan if EADDRINUSE error
In very rare cases, socket cannot be closed in time.
Then we will fail to create the same socket immediately.
So need to retry after EADDRINUSE error happens
Change-Id: I1e54ded102d38cd42b3df40d405205a79b08928b
CRs-Fixed:
2029248
Arne Coucheron [Tue, 21 Feb 2017 06:54:54 +0000 (07:54 +0100)]
Revert "Update Interop datatbase to prevent preferred conn updates"
This reverts commit
6932707ba3df2d3e42e7ecd10ae71086e5b4674f.
Change-Id: I2c636fe05b670aabef51367e36d1c7bfd7c1c26c
Linux Build Service Account [Tue, 4 Apr 2017 10:28:32 +0000 (04:28 -0600)]
Promotion of bt.lnx.2.1.c1-00045.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2009617 I65a477a2976e863ef38b9ff85ecdc72303a46654 Open acceptor channel for RC on cleanup
Change-Id: Ib8cca801b21da9bcdec5ab31402037ee6c23fd50
CRs-Fixed:
2009617
Service qcabuildsw [Tue, 4 Apr 2017 07:29:09 +0000 (00:29 -0700)]
Merge "Open acceptor channel for RC on cleanup" into bt.lnx.2.1.c1-dev
Linux Build Service Account [Fri, 31 Mar 2017 13:13:38 +0000 (07:13 -0600)]
Promotion of bt.lnx.2.1.c1-00044.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2020250 Id0d5a323daabcd0a50193bb7bc6fde18fde3c5ad BT_BOND: Report repeated_attempts failure to application
1106139 I970c8679bf27801fe46f8dd757d6435ed500f77f A2dp connection failing with connection timeout
Change-Id: I1d47008ef989e05f63891a6b85160bb0be8915b0
CRs-Fixed:
1106139,
2020250
Service qcabuildsw [Fri, 31 Mar 2017 09:44:25 +0000 (02:44 -0700)]
Merge "BT_BOND: Report repeated_attempts failure to application" into bt.lnx.2.1.c1-dev
Service qcabuildsw [Fri, 31 Mar 2017 09:43:49 +0000 (02:43 -0700)]
Merge "A2dp connection failing with connection timeout" into bt.lnx.2.1.c1-dev
Ayan Ghosh [Mon, 20 Feb 2017 14:20:57 +0000 (19:50 +0530)]
Open acceptor channel for RC on cleanup
Open acceptor channel for RC on cleanup
as if there will be no listening acceptor
then some Remotes unable to connect AVRC
connection upon remote restart.
CRs-Fixed:
2009617
Change-Id: I65a477a2976e863ef38b9ff85ecdc72303a46654
Pradeep Panigrahi [Thu, 16 Mar 2017 10:50:51 +0000 (16:20 +0530)]
Fix HOGP report handling with HOGP devices
This fixes com.android.bluetooth crash when receiving HOGP reports
for unknown characteristic.
CRs-fixed:
2020549
Change-Id: I29cf2824d12a26aaedde31e156f1b7bf69af65e6
Linux Build Service Account [Mon, 27 Mar 2017 15:05:00 +0000 (09:05 -0600)]
Merge
d4093e14ca11ad7dc0fa469a6552dabf49651316 on remote branch
Change-Id: Id27b02da5a5d27c713c92c7872cc721ef40ae71d
Pavlin Radoslavov [Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
Bug:
34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
Pradeep Panigrahi [Wed, 22 Mar 2017 06:02:40 +0000 (11:32 +0530)]
Cancel the link idle timer during gatt_connect
When app use link count becomes zero, we start an link idle
timeout of 1 sec, post which we send disconnection. Meanwhile
if we get connect request from app to hold the link before
the 1 sec timer expiration, we should cancel the link idle
timer, other wise the link will get disconnected irrespective
of app use link count being greater than zero. Add change to
cancel the link idle timer while updating app's link hold count
CRs-Fixed:
2018001
Change-Id: I41682be1476d4c1c4ee58061407b94cfd2a2657a
juncao [Wed, 15 Mar 2017 10:53:24 +0000 (18:53 +0800)]
BT_BOND: Report repeated_attempts failure to application
This change will ensure BT stack to send repeated attempts
failure reason code to upper application.
Change-Id: Id0d5a323daabcd0a50193bb7bc6fde18fde3c5ad
CRs-Fixed:
2020250
Linux Build Service Account [Wed, 15 Mar 2017 03:12:10 +0000 (21:12 -0600)]
Promotion of bt.lnx.2.1.c1-00042.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1082873 Id942389cb44b048061a7457372d642e39bf75767 Enable authentication for a2dp
Change-Id: I5ffc52dfd0a85f16fd86046ef006edf79609db26
CRs-Fixed:
1082873
Service qcabuildsw [Tue, 14 Mar 2017 06:50:00 +0000 (23:50 -0700)]
Merge "Enable authentication for a2dp" into bt.lnx.2.1.c1-dev
Linux Build Service Account [Mon, 13 Mar 2017 17:44:09 +0000 (11:44 -0600)]
Merge
c129a2b0b8df3692d4a95575db65591fdf43beb1 on remote branch
Change-Id: I708fb31a034144b1ed647acf09ccd2f8f07a3b8c
Linux Build Service Account [Tue, 7 Mar 2017 09:22:56 +0000 (02:22 -0700)]
Promotion of bt.lnx.2.1.c1-00040.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2012478 Ice128c5595f6e7a53958db2e388d25fc25733fc0 Handle LE enhanced conn complete for rpa resolve
Change-Id: Ibe272abddc8c7f0379f8edb0f8dcde7ccb6635a4
CRs-Fixed:
2012478
siminy [Tue, 28 Feb 2017 10:12:18 +0000 (18:12 +0800)]
Handle LE enhanced conn complete for rpa resolve
Handle LE Enhanced Connection Complete Event when
handling random address complete on connection
complete event.
CRs-Fixed:
2012478
Change-Id: Ice128c5595f6e7a53958db2e388d25fc25733fc0
Linux Build Service Account [Mon, 27 Feb 2017 11:42:51 +0000 (04:42 -0700)]
Promotion of bt.lnx.2.1.c1-00039.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1105371 I7b213ac73ba5107f5da7d11305cd349e4d310062 BT: Pairing fails when it coincides with role switch wit
Change-Id: Iead240d54247ed8bf355d1b48f9eb343cd9b6860
CRs-Fixed:
1105371
Service qcabuildsw [Mon, 27 Feb 2017 10:23:48 +0000 (02:23 -0800)]
Merge "BT: Pairing fails when it coincides with role switch with 3rd device" into bt.lnx.2.1.c1-dev
Linux Build Service Account [Mon, 27 Feb 2017 09:48:48 +0000 (02:48 -0700)]
Merge
3a7f7e4142d7e28d00a7d65277ab0900095846dc on remote branch
Change-Id: I4c028cd00ccda4b441a4e864205906dbe23aacdc
Arne Coucheron [Tue, 21 Feb 2017 06:54:54 +0000 (07:54 +0100)]
Revert "BT: Modified logging framework for unified logging"
Requires proprietary libbt-logClient.so file from CAF.
This reverts commit
b7998a405dd1d87f039a6b1e4881769ce934a9ab.
Change-Id: I1ea81dbecd74c2b9ae4d5f8719938db9018770ab
Linux Build Service Account [Thu, 23 Feb 2017 08:58:05 +0000 (01:58 -0700)]
Promotion of bt.lnx.2.1.c1-00038.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1109370 I6514825ab7880099188c2360cdf7eab00f23442f HID: Correct Max latency used for SSR
Change-Id: Ic550ebbf453a5918275b7666b8593805f2ba456f
CRs-Fixed:
1109370
Service qcabuildsw [Thu, 23 Feb 2017 07:42:16 +0000 (23:42 -0800)]
Merge "HID: Correct Max latency used for SSR" into bt.lnx.2.1.c1-dev
Dan Pasanen [Tue, 14 Feb 2017 19:35:05 +0000 (13:35 -0600)]
Revert "Bluetooth-Wipower: Enable WiPower feature."
This reverts commit
10df4bbd4a0872be624c3559a00dfaedc137d717.
Change-Id: If4e248056df949c59098a5e0ba8b56aee23ab597
Nitin Arora [Fri, 19 Aug 2016 00:54:22 +0000 (17:54 -0700)]
BT: Pairing fails when it coincides with role switch with 3rd device
Authentication complete after role switch with a device after
role switch caused initialization of sdp and finally change
in bond state machine. This becomes a problem a bonding activity
is also in progress.
Added condition to ensure initialization of sdp only when
authentication complete has arrived from the same device for
which bonding was initialized.
Change-Id: I7b213ac73ba5107f5da7d11305cd349e4d310062
CRs-Fixed:
1105371
Linux Build Service Account [Mon, 13 Feb 2017 14:50:17 +0000 (07:50 -0700)]
Merge
d999d8a7f8e9a9ff7af54692f34eb5661874f685 on remote branch
Change-Id: Ib8cd64d74387c5c057f63ed4508657ae1ac3d52a
Linux Build Service Account [Sat, 11 Feb 2017 04:52:54 +0000 (21:52 -0700)]
Promotion of bt.lnx.2.1.c1-00035.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1106396 I7b612323891eb4205b2dd6dcd8df7a527d875f09 PAN: decrease number of PAN connection while BNEP connec
Change-Id: I92eb9e11e45e2fe6305a22fbf5b06a064b26b61e
CRs-Fixed:
1106396
zhenchao [Fri, 30 Dec 2016 05:45:12 +0000 (13:45 +0800)]
PAN: decrease number of PAN connection while BNEP connect fail
While BNEP connect request and BNEP connect indication occur at
the same time. BNEP connect would fail, but PAN connection number
is not decreased by one after return failure. So that subsequent
PAN connection always fail.
CRs-Fixed:
1106396
Change-Id: I7b612323891eb4205b2dd6dcd8df7a527d875f09
Linux Build Service Account [Wed, 8 Feb 2017 04:25:49 +0000 (21:25 -0700)]
Promotion of bt.lnx.2.1.c1-00034.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1090716 I7fb52edbd304c48358eb8269001de2b18d36029f Do not use remote device's preferred connection params.
2001484 I48e4b5117bec9cb26fc22a2b3c83a7254b7b03de BT: Disable outgoing profile connection in collision
1105610 I866617f1f443c90a0a9ee16a90bafea709e262cd BT: Resetting BTA dm state while sending disable event
Change-Id: I789ab1975d5d02556df5f54c1755a2dd3cf7b4a1
CRs-Fixed:
2001484,
1090716,
1105610
Service qcabuildsw [Wed, 8 Feb 2017 03:24:49 +0000 (19:24 -0800)]
Merge "BT: Resetting BTA dm state while sending disable event" into bt.lnx.2.1.c1-dev
Service qcabuildsw [Wed, 8 Feb 2017 03:24:09 +0000 (19:24 -0800)]
Merge "Do not use remote device's preferred connection params." into bt.lnx.2.1.c1-dev
Venkata Jagadeesh Garaga [Mon, 30 Jan 2017 09:59:13 +0000 (15:29 +0530)]
BT: Disable outgoing profile connection in collision
Disable outgoing profile connection in collision case
for Honda HFT Remote Device.
Change-Id: I48e4b5117bec9cb26fc22a2b3c83a7254b7b03de
CRs-fixed:
2001484
Linux Build Service Account [Thu, 2 Feb 2017 18:09:32 +0000 (11:09 -0700)]
Promotion of bt.lnx.2.1.c1-00033.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1113999 I5a8c9e76fca4f80c1f2a3513344f79042cc5728b Fix for the issues reported by static analysis tool.
Change-Id: I268793b33b6757b0dbfc51eea69999d4ca35e55c
CRs-Fixed:
1113999
Service qcabuildsw [Thu, 2 Feb 2017 17:07:56 +0000 (09:07 -0800)]
Merge "Fix for the issues reported by static analysis tool." into bt.lnx.2.1.c1-dev
Hemant Gupta [Fri, 9 Dec 2016 17:40:10 +0000 (23:10 +0530)]
HID: Prevent crash by Cancelling SDP during cleanup
Usecase:
1) User tried to connect to HID Device.
2) SDP is internally performed by DUT. SDP is at stage,
where L2CAP connection, configuration is done, and data
fetch is ongoing.
3) BT was turned off from UI.
Observation:
BT crashed while accessing memory that was freed already because BT turn off,
caused ACL disconnection, leading to L2CAP disconnect indication in stack,
leading to sdp disconnect indication.
backtrace:
#00 pc
000f98d4 /system/lib/hw/bluetooth.default.so (SDP_FindServiceUUIDInDb+51)
#01 pc
000b5dbd /system/lib/hw/bluetooth.default.so (hidh_search_callback+0x40)
#02 pc
000f770b /system/lib/hw/bluetooth.default.so (sdp_disconnect_ind+0x5e)
#03 pc
00107a5f /system/lib/hw/bluetooth.default.so (l2c_csm_execute+3446)
#04 pc
001080e7 /system/lib/hw/bluetooth.default.so (l2c_link_hci_disc_comp+122)
#05 pc
000fda81 /system/lib/hw/bluetooth.default.so (btu_hcif_process_event+588)
#06 pc
000fec81 /system/lib/hw/bluetooth.default.so (btu_hci_msg_ready+96)
#07 pc
00118191 /system/lib/hw/bluetooth.default.so
#08 pc
0011917f /system/lib/hw/bluetooth.default.so
#09 pc
00041993 /system/lib/libc.so (_ZL15__pthread_startPv+30)
#10 pc
000192b5 /system/lib/libc.so (__start_thread+6)
Register Dump
pid: 15740, tid: 15761, name: bluedroid wake/ >>> com.android.bluetooth <<<
signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x20000
r0
815a5cac r1
a1a2f370 r2
00000000 r3
85d4e541
r4
00020000 r5
815a5cac r6
a1a2f370 r7
b6d3ae40
r8
00000000 r9
b6d3ae40 sl
00000002 fp
00000013
ip
a228c050 sp
a1a2f360 lr
a20eddc1 pc
a21318d4 cpsr
200e0030
Rootcause
The above scenario could lead to crash we see as below, as bta_hh_cb.p_disc_db would be freed
during HID Host cleanup, and would be accessed via callback received for parsing SDP results on
SDP completion.
Fix:
While cleaning up HID Host, Cancel SDP search before freeing and resetting bta_hh_cb.p_disc_db.
This will internally send L2CAP disconnect request for SDP, and would lead to sdp_disconnect_cfm
call when L2CAP is disconnected, and would lead to call of hidh_search_callback with result code
as SDP_CANCEL.
BACKPORT OF: https://android-review.googlesource.com/#/c/312104/
Change-Id: I63563cb23dd69946f87a70cafa203c44edc9b753
(cherry picked from commit
eed8b166ef55c21b187ee5438d938886d2e9a760)
Linux Build Service Account [Wed, 1 Feb 2017 09:26:38 +0000 (02:26 -0700)]
Promotion of bt.lnx.2.1.c1-00032.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
934966 I59afb07c9f8c1eb4cb1fc4c938710ec24761debb Prevents rejection of valid max connection interval para
Change-Id: I1bf108b24a9d34285e4f6fa47d9d41027427674e
CRs-Fixed: 934966
Service qcabuildsw [Wed, 1 Feb 2017 06:31:44 +0000 (22:31 -0800)]
Merge "Prevents rejection of valid max connection interval parameter update requests" into bt.lnx.2.1.c1-dev
Linux Build Service Account [Tue, 31 Jan 2017 17:06:19 +0000 (10:06 -0700)]
Merge
dfdf1871169725fa8869d0c2cc789d6785f61aaa on remote branch
Change-Id: I0a23144e0bfaf3f1a25f06c85f0e2b46e7a620e3
Linux Build Service Account [Mon, 30 Jan 2017 11:31:25 +0000 (04:31 -0700)]
Promotion of bt.lnx.2.1.c1-00031.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1113473 I5676534a0c05a81e508e7ed9495b739ca3be0493 Bluetooth: fix fd leak during add/remove gatt service
Change-Id: I69b726fe52db59ffefc24d6758eecb11c6cd1aee
CRs-Fixed:
1113473
Service qcabuildsw [Mon, 30 Jan 2017 09:01:40 +0000 (01:01 -0800)]
Merge "Bluetooth: fix fd leak during add/remove gatt service" into bt.lnx.2.1.c1-dev
Gurpreet Ghai [Thu, 29 Dec 2016 14:42:16 +0000 (20:12 +0530)]
BT: Resetting BTA dm state while sending disable event
Problem: When disable timer fires after waiting for closure
of ACL connections, bta dm disable event is sent. However,
the bta dm state is not reset. This causes, next enable
sequence to return without starting modules.
Error: When controller module is not initialized during enable
sequence and controller module functions are accessed, assert
occurs causing Bluetooth process to crash.
Fix: The disable event must be sent from proper channel by
calling the appropriate callback even in the case of timeout.
CRs-Fixed:
1105610
Change-Id: I866617f1f443c90a0a9ee16a90bafea709e262cd
Linux Build Service Account [Fri, 27 Jan 2017 06:08:53 +0000 (23:08 -0700)]
Promotion of bt.lnx.2.1.c1-00030.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1113361 Ia8671d83523c368fbf1441fe42a66067fb99d1fd RFCOMM: Incoming connection from car radio failing
Change-Id: I67cd4b2c9275c5b052a84a23bb8760cb222d3626
CRs-Fixed:
1113361