OSDN Git Service

android-x86/system-bt.git
7 years agoDO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0 ...
Sridhar Vashist [Fri, 5 May 2017 01:26:52 +0000 (01:26 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0  -s ours am: 6c0de854a3  -s ours
am: f505a01c14  -s ours

Change-Id: Iebaa74fce96186c671bb789b7aa5f465f5ad3d83

7 years agoDO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0 ...
Sridhar Vashist [Fri, 5 May 2017 01:23:51 +0000 (01:23 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0  -s ours am: 6c0de854a3  -s ours
am: 4311275640  -s ours

Change-Id: I432a3be6d12b09cdb9359f75e55868d6396e80fd

7 years agoDO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0 ...
Sridhar Vashist [Fri, 5 May 2017 01:21:52 +0000 (01:21 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0  -s ours
am: 6c0de854a3  -s ours

Change-Id: I1461d75a0cdf2fb5a209b094df02830092c05141

7 years agoDO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0 ...
Sridhar Vashist [Fri, 5 May 2017 01:21:51 +0000 (01:21 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links. am: 7d3de37da0  -s ours
am: 6c0de854a3  -s ours

Change-Id: Iaba991df9e9a60f45ef12b4b03a0b6e555b40a33

7 years agoDO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links.
Sridhar Vashist [Fri, 5 May 2017 01:17:20 +0000 (01:17 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links.
am: 7d3de37da0  -s ours

Change-Id: I90f535c99d45ebf0def0b2b08031a21f998c1c2e

7 years agoDO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links.
Sridhar Vashist [Fri, 28 Oct 2016 18:37:49 +0000 (13:37 -0500)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links.

3DH packets have a lower tolerance to background noise. A2DP requiring higher
bandwidth & realtime playback is especially suscepitble in this scenario.

Bug: 37515006
Test: oem manual
Change-Id: Id4d7452a86fe864eceb88a9fb16a40dc921a1e13

7 years agoMerge "Limit btsnoop file size (5/9)" into oc-dev
Ajay Panicker [Thu, 4 May 2017 23:34:27 +0000 (23:34 +0000)]
Merge "Limit btsnoop file size (5/9)" into oc-dev
am: a46530704f  -s ours

Change-Id: I1408f63c75a01e4de60487499abc14d1c9c4cc6f

7 years agoLimit btsnoop file size (5/9)
Ajay Panicker [Thu, 4 May 2017 23:23:39 +0000 (23:23 +0000)]
Limit btsnoop file size (5/9)
am: 21ae30a6e5  -s ours

Change-Id: I1dc9b52163fb2c35c3c7e06444d93619f7f98956

7 years agoMerge "Limit btsnoop file size (5/9)" into oc-dev
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (5/9)" into oc-dev

7 years agoMerge "Add supervision timeout workaround for Nexus Remote" into oc-dev
Jakub Pawlowski [Thu, 4 May 2017 20:27:01 +0000 (20:27 +0000)]
Merge "Add supervision timeout workaround for Nexus Remote" into oc-dev
am: 51e56f54c4

Change-Id: I1b9b2bb3974561f2920007d09b4bf43ebefebd1d

7 years agoMerge "Add supervision timeout workaround for Nexus Remote" into oc-dev
Jakub Pawlowski [Thu, 4 May 2017 20:22:57 +0000 (20:22 +0000)]
Merge "Add supervision timeout workaround for Nexus Remote" into oc-dev

7 years agoRemove 96.0 and 88.2 kHz sample rate from A2DP AAC capability
Pavlin Radoslavov [Thu, 4 May 2017 20:21:00 +0000 (20:21 +0000)]
Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability
am: d7809b1a8c

Change-Id: I90b107263feab693df2456be83d1c0517f321cb5

7 years agoMerge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability" am: d861719531...
Pavlin Radoslavov [Thu, 4 May 2017 18:40:13 +0000 (18:40 +0000)]
Merge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability" am: d861719531 am: d4ff605732
am: f096faed1a

Change-Id: Icc28a63acfd837a7b516d1e4a987db123a8f734e

7 years agoMerge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability" am: d861719531
Pavlin Radoslavov [Thu, 4 May 2017 18:32:54 +0000 (18:32 +0000)]
Merge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability" am: d861719531
am: d4ff605732

Change-Id: Iac92fa917a98cdf8e3c358d7386b4b27a688f98b

7 years agoMerge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability"
Pavlin Radoslavov [Thu, 4 May 2017 18:27:24 +0000 (18:27 +0000)]
Merge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability"
am: d861719531

Change-Id: Iee78e052c01a772f30c6dcf19a9bf97036751f5c

7 years agoMerge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability"
Treehugger Robot [Thu, 4 May 2017 18:23:50 +0000 (18:23 +0000)]
Merge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability"

7 years agoAdd supervision timeout workaround for Nexus Remote
Jakub Pawlowski [Tue, 28 Mar 2017 19:58:34 +0000 (12:58 -0700)]
Add supervision timeout workaround for Nexus Remote

The Nexus Remote would report 100ms supervision timeout in its preferred
connection parameters. In some noisy environments, this might cause
connection to be dropped. As a workaround, set the timeout to 3s for the
remote.

Test: manual
Bug: 36645397
Bug: 37717216
Change-Id: I665a854e9d55067ec1aca273c31d06c6114c48be
(cherry picked from commit 9e6747537a4a2c0143c26ab31e4597a017372e5f)

7 years agoRemove 96.0 and 88.2 kHz sample rate from A2DP AAC capability
Pavlin Radoslavov [Thu, 4 May 2017 05:48:28 +0000 (22:48 -0700)]
Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability

The A2DP AAC Source capabilty should not include 96.0 and 88.2 kHz
sample rate - those were included unintentionally without being tested.

Bug: 37968743
Test: A2DP AAC streaming
Change-Id: Ia3228d4d14d3288acfda42fbaf8ab248ae530b48
(cherry picked from commit 4b93aeb450c4e42a80d8519528dc8fcfacc1d964)

7 years agoAdd supervision timeout workaround for Nexus Remote am: 9e6747537a am: ce0e5306db
Jakub Pawlowski [Thu, 4 May 2017 16:56:16 +0000 (16:56 +0000)]
Add supervision timeout workaround for Nexus Remote am: 9e6747537a am: ce0e5306db
am: a8ed61342e

Change-Id: I674832a273689570ef727fecd35da0b1ed0b7b8c

7 years agoAdd supervision timeout workaround for Nexus Remote am: 9e6747537a
Jakub Pawlowski [Thu, 4 May 2017 16:52:44 +0000 (16:52 +0000)]
Add supervision timeout workaround for Nexus Remote am: 9e6747537a
am: ce0e5306db

Change-Id: Ia97abb523bd9e4b60a844440f75770f55f555517

7 years agoAdd supervision timeout workaround for Nexus Remote
Jakub Pawlowski [Thu, 4 May 2017 16:49:44 +0000 (16:49 +0000)]
Add supervision timeout workaround for Nexus Remote
am: 9e6747537a

Change-Id: I89970cc9eaf72cbbbae294dc1a6816b612ed7579

7 years agoAdd supervision timeout workaround for Nexus Remote
Jakub Pawlowski [Tue, 28 Mar 2017 19:58:34 +0000 (12:58 -0700)]
Add supervision timeout workaround for Nexus Remote

The Nexus Remote would report 100ms supervision timeout in its preferred
connection parameters. In some noisy environments, this might cause
connection to be dropped. As a workaround, set the timeout to 3s for the
remote.

Test: manual
Bug: 36645397
Bug: 37717216
Change-Id: I665a854e9d55067ec1aca273c31d06c6114c48be

7 years agoRemove 96.0 and 88.2 kHz sample rate from A2DP AAC capability
Pavlin Radoslavov [Thu, 4 May 2017 05:48:28 +0000 (22:48 -0700)]
Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability

The A2DP AAC Source capabilty should not include 96.0 and 88.2 kHz
sample rate - those were included unintentionally without being tested.

Bug: 37968743
Test: A2DP AAC streaming
Change-Id: Ia3228d4d14d3288acfda42fbaf8ab248ae530b48

7 years agoaudio_a2dp_hw: fix fd leak on open am: 2ae1ddbb73 am: f77c756a93
Andy Hung [Wed, 3 May 2017 01:52:09 +0000 (01:52 +0000)]
audio_a2dp_hw: fix fd leak on open am: 2ae1ddbb73 am: f77c756a93
am: 3dfb29aada

Change-Id: I919a8e9247c68710dd73b28ebe81c3e7aee54ccb

7 years agoaudio_a2dp_hw: fix fd leak on open am: 2ae1ddbb73
Andy Hung [Wed, 3 May 2017 01:47:10 +0000 (01:47 +0000)]
audio_a2dp_hw: fix fd leak on open am: 2ae1ddbb73
am: f77c756a93

Change-Id: I34e607c7c9a161c470992f281d4106f6c1eee0e8

7 years agoaudio_a2dp_hw: fix fd leak on open
Andy Hung [Wed, 3 May 2017 01:44:11 +0000 (01:44 +0000)]
audio_a2dp_hw: fix fd leak on open
am: 2ae1ddbb73

Change-Id: Ieed84c659c4b10d126ab31cf0d2fe1ad15083e27

7 years agoaudio_a2dp_hw: fix fd leak on open
Andy Hung [Wed, 3 May 2017 01:41:39 +0000 (01:41 +0000)]
audio_a2dp_hw: fix fd leak on open
am: f95d27bae9

Change-Id: I9a02980a141f132125ff12ad7dc8dec49c17da30

7 years agoaudio_a2dp_hw: fix fd leak on open
Andy Hung [Mon, 1 May 2017 22:04:57 +0000 (15:04 -0700)]
audio_a2dp_hw: fix fd leak on open

Open hal fds can be checked by

adb shell lsof | grep audio@2. | grep socket | wc

Test: connect and disconnect BT, check open fd.
Bug: 37726871

Change-Id: Id446c43515eceb0828cfb33807a4c0b4c6145a6d

7 years agoaudio_a2dp_hw: fix fd leak on open
Andy Hung [Mon, 1 May 2017 22:04:57 +0000 (15:04 -0700)]
audio_a2dp_hw: fix fd leak on open

Open hal fds can be checked by

adb shell lsof | grep audio@2. | grep socket | wc

Test: connect and disconnect BT, check open fd.
Bug: 37726871

Change-Id: Id446c43515eceb0828cfb33807a4c0b4c6145a6d
(cherry picked from commit cef156574c9928164b7a5e263a5494cf61ca39d8)

7 years agoDo not GATT_ERROR on MTU change
Jacky Cheung [Tue, 2 May 2017 22:24:25 +0000 (22:24 +0000)]
Do not GATT_ERROR on MTU change
am: 9e5f76c5dd

Change-Id: Ice5df1c6d256d82fc75294fc43167c2f07e30335

7 years agoDo not GATT_ERROR on MTU change
Jacky Cheung [Mon, 17 Apr 2017 20:38:39 +0000 (13:38 -0700)]
Do not GATT_ERROR on MTU change

Bug: 37305498
Test: manual on MSM8909
Change-Id: I07389620efc914d0ece52262edc2c35b498d5564
(cherry picked from commit f271c9109e5608acb393c9bef0bca9d2b0177f5d)

7 years agoMerge "Move ad2p back to system." into oc-dev
Steven Moreland [Sat, 29 Apr 2017 21:13:46 +0000 (21:13 +0000)]
Merge "Move ad2p back to system." into oc-dev
am: 3c05eb1b99

Change-Id: I657ad3827e7b2cc002c2affc906007ac620ce8a9

7 years agoMerge "Move ad2p back to system." into oc-dev
TreeHugger Robot [Sat, 29 Apr 2017 21:06:54 +0000 (21:06 +0000)]
Merge "Move ad2p back to system." into oc-dev

7 years agoMerge "Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into...
Android Build Merger (Role) [Sat, 29 Apr 2017 03:57:38 +0000 (03:57 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev am: b055f8b68a  -s ours am: f67b6bfa1b  -s ours am: 805626f046  -s ours" into oc-dev-plus-aosp

7 years agoMerge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f...
Jacky Cheung [Sat, 29 Apr 2017 03:57:29 +0000 (03:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev am: b055f8b68a  -s ours am: f67b6bfa1b  -s ours
am: 102f2e3d05  -s ours

Change-Id: I2d7a36399faaf4801b5be7d2c73c57af253c076c

7 years agoMerge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f...
Jacky Cheung [Sat, 29 Apr 2017 03:57:29 +0000 (03:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev am: b055f8b68a  -s ours am: f67b6bfa1b  -s ours
am: 805626f046  -s ours

Change-Id: I11de1a247e4ed8a1518fdba054fd1bfd6ddeec44

7 years agoMerge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f...
Jacky Cheung [Sat, 29 Apr 2017 03:55:00 +0000 (03:55 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev am: b055f8b68a  -s ours
am: f67b6bfa1b  -s ours

Change-Id: I94a81ea270037bd5fc7420a52819421125fc5b5b

7 years agoMerge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f...
Jacky Cheung [Sat, 29 Apr 2017 03:54:59 +0000 (03:54 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev am: b055f8b68a  -s ours
am: f67b6bfa1b  -s ours

Change-Id: I292355f59b73a0c7d4347f69fa5f8911a6a98d6c

7 years agoMerge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev
Jacky Cheung [Sat, 29 Apr 2017 03:52:59 +0000 (03:52 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev
am: b055f8b68a  -s ours

Change-Id: I7b31a9bb0a09d3e7bbb2b666331f4ac47a93efff

7 years agoMerge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev
Jacky Cheung [Sat, 29 Apr 2017 03:48:18 +0000 (03:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev

7 years agoDO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing
Jakub Pawlowski [Thu, 27 Apr 2017 11:52:34 +0000 (04:52 -0700)]
DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing

When a device connect to android over LE, the default policy is to keep
this connection. If any app "claims" this connnection, and then stop
using it, we'll disconnect from the device after a short timeout.

If pairing is triggered to such device, that is connected but not used
by any app, it will cause disconnect after the pairing is finished. This
is because using SMP over fixed LE L2CAP channel is conseidered as
connecting, using, and disconnecting a channel by the stack. This is
obvious logic error - using fixed channels should not require
"connecting" to them.

As a temporary workaround, do not trigger a timeout when a fixed SMP
channel is closed over LE.

For LE only devices, this means they will stay connected after the
pairing until some app starts using them or they disconnect. For dual
mode devices, Classic connection will be established and SDP will be
performed. The classic connection will be disconnected if no app will
use it, and the LE connection to the device will stay up.

Bug: 37352720
Test: manual
Change-Id: Ic9d688aacf84e0267277b12b28dfa7cc57fdcea6
(cherry picked from commit 7c8bab231328956d3b7569280cb162be4e345422)

7 years agoMove ad2p back to system.
Steven Moreland [Thu, 27 Apr 2017 21:14:35 +0000 (14:14 -0700)]
Move ad2p back to system.

Test: built to vendor
Fixes: 37681782
Change-Id: I08542090d6b371e3c6de2e65d5c68d0f14c76737

7 years agoMerge "Revert "Make Bluetooth audio threads use RT scheduling"" into oc-dev
Philip Cuadra [Fri, 28 Apr 2017 02:11:21 +0000 (02:11 +0000)]
Merge "Revert "Make Bluetooth audio threads use RT scheduling"" into oc-dev
am: 59a2185c20

Change-Id: Ifd798d2d5270e797b1542867c5ae184946bf89ab

7 years agoMerge "Revert "Make Bluetooth audio threads use RT scheduling"" into oc-dev
Philip Cuadra [Fri, 28 Apr 2017 01:31:47 +0000 (01:31 +0000)]
Merge "Revert "Make Bluetooth audio threads use RT scheduling"" into oc-dev

7 years agoRevert "Make Bluetooth audio threads use RT scheduling"
Philip Cuadra [Fri, 28 Apr 2017 01:27:09 +0000 (01:27 +0000)]
Revert "Make Bluetooth audio threads use RT scheduling"

This reverts commit eaa42774f393eb3ccaee91a958e8df6a8fb09b91.

http://b/37733903
Test:  confirmed switching users does not hang.

Change-Id: Ic54e4ed2dda057e681df225a37a574c221cd8fc3

7 years agoMerge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
Jakub Pawlowski [Fri, 28 Apr 2017 00:36:58 +0000 (00:36 +0000)]
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
am: 88342fb56e

Change-Id: Ic822b70a63867ae579e770c5cc39f56ffd26684f

7 years agoHandle remote not supporting LL_SLAVE_FEATURE_REQ
Jakub Pawlowski [Fri, 28 Apr 2017 00:36:54 +0000 (00:36 +0000)]
Handle remote not supporting LL_SLAVE_FEATURE_REQ
am: 3928d8e3ed

Change-Id: I567b879fc21065450f3955015189de8580cd3801

7 years agoExpose LE advertiser address for easier PTS tests (4/6)
Jakub Pawlowski [Fri, 28 Apr 2017 00:36:49 +0000 (00:36 +0000)]
Expose LE advertiser address for easier PTS tests (4/6)
am: e90b45e001

Change-Id: I7ff46ed6a5f3d9d5aba5108a5b0237c26e9a5655

7 years agoRead by UUID for PTS tests (4/5)
Jakub Pawlowski [Fri, 28 Apr 2017 00:36:43 +0000 (00:36 +0000)]
Read by UUID for PTS tests (4/5)
am: 76f2c8678e

Change-Id: I0d0c3c384d3ba192163bc1f5b8d6d2873e311f36

7 years agoPrevent buffer overflow caused by decrementing past zero am: 882db61b73 am: 6f883c5320
Ajay Panicker [Fri, 28 Apr 2017 00:24:41 +0000 (00:24 +0000)]
Prevent buffer overflow caused by decrementing past zero am: 882db61b73 am: 6f883c5320
am: 5089842163

Change-Id: I6b8392911a01dcb9df98a8a2a90c23857d1c25e8

7 years agoPrevent buffer overflow caused by decrementing past zero am: 882db61b73
Ajay Panicker [Fri, 28 Apr 2017 00:23:09 +0000 (00:23 +0000)]
Prevent buffer overflow caused by decrementing past zero am: 882db61b73
am: 6f883c5320

Change-Id: Ic006fece7c772d161da349904a299f9d53e06e95

7 years agoPrevent buffer overflow caused by decrementing past zero
Ajay Panicker [Fri, 28 Apr 2017 00:20:40 +0000 (00:20 +0000)]
Prevent buffer overflow caused by decrementing past zero
am: 882db61b73

Change-Id: I1de124b2baf7dd3c691df95680c20600680841c0

7 years agoFix issue with BLE advertising not started when local privacy is not enabled
Jacky Cheung [Fri, 28 Apr 2017 00:08:12 +0000 (00:08 +0000)]
Fix issue with BLE advertising not started when local privacy is not enabled
am: 72d2bbee15

Change-Id: Ifb666a393733e5f5f9a6a588442e3d8389da2181

7 years agoMerge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 22:20:37 +0000 (22:20 +0000)]
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev

* changes:
  Fix LE disconnecting right after pairing
  Handle remote not supporting LL_SLAVE_FEATURE_REQ
  Expose LE advertiser address for easier PTS tests (4/6)
  Read by UUID for PTS tests (4/5)

7 years agoPrevent buffer overflow caused by decrementing past zero
Ajay Panicker [Tue, 13 Dec 2016 18:51:12 +0000 (10:51 -0800)]
Prevent buffer overflow caused by decrementing past zero

Bug: 33555809
Test: Sanity test with Bluetooth
Change-Id: I4c82d3c162ffdc9436f9cd8985061655a055774b

7 years agoLimit btsnoop file size (5/9)
Ajay Panicker [Tue, 18 Apr 2017 03:53:24 +0000 (20:53 -0700)]
Limit btsnoop file size (5/9)

Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: Ia8741223cb31b2c20d9ef5607e9204cc3946b165
Change-Id: Ia8741223cb31b2c20d9ef5607e9204cc3946b165

7 years agoFix LE disconnecting right after pairing am: 7c8bab2313 am: 30c04f0ed5
Jakub Pawlowski [Thu, 27 Apr 2017 20:00:13 +0000 (20:00 +0000)]
Fix LE disconnecting right after pairing am: 7c8bab2313 am: 30c04f0ed5
am: 454d12a409

Change-Id: I5fe6c2155eb11ec6850ed5014f9ed9c060072cc9

7 years agoFix issue with BLE advertising not started when local privacy is not enabled
Jacky Cheung [Wed, 26 Apr 2017 17:27:41 +0000 (10:27 -0700)]
Fix issue with BLE advertising not started when local privacy is not enabled

Bug: 37282500
Test: manual
Change-Id: I44657d0b3315bc241373c8cbaf6a2b6a6e49f31d

7 years agoFix LE disconnecting right after pairing
Jakub Pawlowski [Thu, 27 Apr 2017 11:52:34 +0000 (04:52 -0700)]
Fix LE disconnecting right after pairing

When a device connect to android over LE, the default policy is to keep
this connection. If any app "claims" this connnection, and then stop
using it, we'll disconnect from the device after a short timeout.

If pairing is triggered to such device, that is connected but not used
by any app, it will cause disconnect after the pairing is finished. This
is because using SMP over fixed LE L2CAP channel is conseidered as
connecting, using, and disconnecting a channel by the stack. This is
obvious logic error - using fixed channels should not require
"connecting" to them.

As a temporary workaround, do not trigger a timeout when a fixed SMP
channel is closed over LE.

For LE only devices, this means they will stay connected after the
pairing until some app starts using them or they disconnect. For dual
mode devices, Classic connection will be established and SDP will be
performed. The classic connection will be disconnected if no app will
use it, and the LE connection to the device will stay up.

Bug: 37352720
Test: manual
Change-Id: Ic9d688aacf84e0267277b12b28dfa7cc57fdcea6
(cherry picked from commit 7c8bab231328956d3b7569280cb162be4e345422)

7 years agoHandle remote not supporting LL_SLAVE_FEATURE_REQ
Jakub Pawlowski [Mon, 24 Apr 2017 13:34:11 +0000 (06:34 -0700)]
Handle remote not supporting LL_SLAVE_FEATURE_REQ

Test: for PTS
Change-Id: I3030a068c1c4980fa7cbb23b478afbe441584869
(cherry picked from commit 341b6db90d67e76ea9262c5e9f3ba5063cb93598)

7 years agoExpose LE advertiser address for easier PTS tests (4/6)
Jakub Pawlowski [Wed, 19 Apr 2017 14:05:00 +0000 (07:05 -0700)]
Expose LE advertiser address for easier PTS tests (4/6)

This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.

Bug: 35147497
Test: manual
Change-Id: I5ad554d872f2b772f2bf91642a9648c4018d935c
(cherry picked from commit 779b4fd786c571cb8013f4d94ddacfe7116fb05f)

7 years agoRead by UUID for PTS tests (4/5)
Jakub Pawlowski [Fri, 14 Apr 2017 14:27:49 +0000 (07:27 -0700)]
Read by UUID for PTS tests (4/5)

Add a hidden api for reading characteristic by UUID for PTS.

Bug: 35150313
Test: sl4a GattReadTest.byUuid
Change-Id: I072473c5f7b761707774efd89f8a22bfdf012135
(cherry picked from commit 7dd34f52bc950bae2fb1b30b17da0ff34ee016aa)

7 years agoFix LE disconnecting right after pairing am: 7c8bab2313
Jakub Pawlowski [Thu, 27 Apr 2017 19:35:57 +0000 (19:35 +0000)]
Fix LE disconnecting right after pairing am: 7c8bab2313
am: 30c04f0ed5

Change-Id: Ic0990a742fd44c84d181ff31d4f85b2b5cf52ec9

7 years agoFix LE disconnecting right after pairing
Jakub Pawlowski [Thu, 27 Apr 2017 19:30:24 +0000 (19:30 +0000)]
Fix LE disconnecting right after pairing
am: 7c8bab2313

Change-Id: I22b794624d6f3b51d1e0089802cbf53c64305b51

7 years agoFix LE disconnecting right after pairing
Jakub Pawlowski [Thu, 27 Apr 2017 11:52:34 +0000 (04:52 -0700)]
Fix LE disconnecting right after pairing

When a device connect to android over LE, the default policy is to keep
this connection. If any app "claims" this connnection, and then stop
using it, we'll disconnect from the device after a short timeout.

If pairing is triggered to such device, that is connected but not used
by any app, it will cause disconnect after the pairing is finished. This
is because using SMP over fixed LE L2CAP channel is conseidered as
connecting, using, and disconnecting a channel by the stack. This is
obvious logic error - using fixed channels should not require
"connecting" to them.

As a temporary workaround, do not trigger a timeout when a fixed SMP
channel is closed over LE.

For LE only devices, this means they will stay connected after the
pairing until some app starts using them or they disconnect. For dual
mode devices, Classic connection will be established and SDP will be
performed. The classic connection will be disconnected if no app will
use it, and the LE connection to the device will stay up.

Bug: 37352720
Test: manual
Change-Id: Ic9d688aacf84e0267277b12b28dfa7cc57fdcea6

7 years agoLimit btsnoop file size (5/8) am: 99c3422442 am: 7f51bd9833
Ajay Panicker [Thu, 27 Apr 2017 18:21:22 +0000 (18:21 +0000)]
Limit btsnoop file size (5/8) am: 99c3422442 am: 7f51bd9833
am: 8f59f129d5

Change-Id: Icbbf94d3d3092dc0b8d60dfed7f8c1ca3d213b51

7 years agoLimit btsnoop file size (5/8) am: 99c3422442
Ajay Panicker [Thu, 27 Apr 2017 17:49:49 +0000 (17:49 +0000)]
Limit btsnoop file size (5/8) am: 99c3422442
am: 7f51bd9833

Change-Id: I44d59395bd33f9a7ac54cf228c2c0b2a5a7f5f73

7 years agoLimit btsnoop file size (5/8)
Ajay Panicker [Thu, 27 Apr 2017 17:39:55 +0000 (17:39 +0000)]
Limit btsnoop file size (5/8)
am: 99c3422442

Change-Id: I015663966b19215d7ea4c3add0ed93948430df64

7 years agoLimit btsnoop file size (5/8)
Ajay Panicker [Tue, 18 Apr 2017 03:53:24 +0000 (20:53 -0700)]
Limit btsnoop file size (5/8)

Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: Ia8741223cb31b2c20d9ef5607e9204cc3946b165
Change-Id: Ia8741223cb31b2c20d9ef5607e9204cc3946b165

7 years agoFix issue with BLE advertising not started when local privacy is not enabled am:...
Jacky Cheung [Wed, 26 Apr 2017 22:42:08 +0000 (22:42 +0000)]
Fix issue with BLE advertising not started when local privacy is not enabled am: afdd081b4b am: 4545519e16
am: 3fd70c6fb3

Change-Id: If4c60d670c91845abfa4b17fa12e12fa8bffe86c

7 years agoFix issue with BLE advertising not started when local privacy is not enabled am:...
Jacky Cheung [Wed, 26 Apr 2017 22:31:58 +0000 (22:31 +0000)]
Fix issue with BLE advertising not started when local privacy is not enabled am: afdd081b4b
am: 4545519e16

Change-Id: I879c74e752290665526af3b7933e4ddedabe2552

7 years agoFix issue with BLE advertising not started when local privacy is not enabled
Jacky Cheung [Wed, 26 Apr 2017 22:27:57 +0000 (22:27 +0000)]
Fix issue with BLE advertising not started when local privacy is not enabled
am: afdd081b4b

Change-Id: I22817c79ffc0d7749261b18bcbd608fad70c20d3

7 years agoMake Bluetooth audio threads use RT scheduling
Philip Cuadra [Wed, 26 Apr 2017 21:28:30 +0000 (21:28 +0000)]
Make Bluetooth audio threads use RT scheduling
am: eaa42774f3

Change-Id: Id0bf13a5f129fd8eda8134debe9ed996c613e8c2

7 years agoMake Bluetooth audio threads use RT scheduling
Philip Cuadra [Thu, 23 Mar 2017 17:10:34 +0000 (10:10 -0700)]
Make Bluetooth audio threads use RT scheduling

Bluetooth threads that are used in audio have deadline
requirements for glitchless playback.  Those threads need to be
scheduled as RT tasks to ensure that they can meet the deadline even if
there is high system load.

Bug 37518404

Test:  play Bluetooth audio, check for RT with systrace
Merged-In: I4505fbce55e5a4fe18d00dbda23646a60e482efd
Change-Id: I4505fbce55e5a4fe18d00dbda23646a60e482efd
(cherry picked from commit 96c42e70f5c6a74a737739aa9c297cd93540f43e)

7 years agoFix issue with BLE advertising not started when local privacy is not enabled
Jacky Cheung [Wed, 26 Apr 2017 17:27:41 +0000 (10:27 -0700)]
Fix issue with BLE advertising not started when local privacy is not enabled

Bug: 37282500
Test: manual
Change-Id: I44657d0b3315bc241373c8cbaf6a2b6a6e49f31d

7 years agoMake Bluetooth audio threads use RT scheduling am: 96c42e70f5 am: dc45bd8315
Philip Cuadra [Wed, 26 Apr 2017 17:10:39 +0000 (17:10 +0000)]
Make Bluetooth audio threads use RT scheduling am: 96c42e70f5 am: dc45bd8315
am: 521a4d3acf

Change-Id: I0a60346bd9d9521c77d52dda4f838da84c8d8d74

7 years agoMake Bluetooth audio threads use RT scheduling am: 96c42e70f5
Philip Cuadra [Wed, 26 Apr 2017 17:06:09 +0000 (17:06 +0000)]
Make Bluetooth audio threads use RT scheduling am: 96c42e70f5
am: dc45bd8315

Change-Id: Ib0475baf75c0a963c074e0f9bbb2d9da3e09e86b

7 years agoMake Bluetooth audio threads use RT scheduling
Philip Cuadra [Wed, 26 Apr 2017 17:02:11 +0000 (17:02 +0000)]
Make Bluetooth audio threads use RT scheduling
am: 96c42e70f5

Change-Id: Idcea625a9ca29fe5f5b4c0cc81e74e28d3670b04

7 years agoMake Bluetooth audio threads use RT scheduling
Philip Cuadra [Thu, 23 Mar 2017 17:10:34 +0000 (10:10 -0700)]
Make Bluetooth audio threads use RT scheduling

Bluetooth threads that are used in audio have deadline
requirements for glitchless playback.  Those threads need to be
scheduled as RT tasks to ensure that they can meet the deadline even if
there is high system load.

Bug 37518404

Test:  play Bluetooth audio, check for RT with systrace
Change-Id: I4505fbce55e5a4fe18d00dbda23646a60e482efd

7 years agoMerge "Add missing library dependency when compiling the unit tests" into oc-dev
Pavlin Radoslavov [Tue, 25 Apr 2017 18:04:47 +0000 (18:04 +0000)]
Merge "Add missing library dependency when compiling the unit tests" into oc-dev
am: fc9f1bcd77

Change-Id: I117881b8d06d77b02b6a5e9c82b5eaba19b23b73

7 years agoMerge "Add missing library dependency when compiling the unit tests" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 17:39:47 +0000 (17:39 +0000)]
Merge "Add missing library dependency when compiling the unit tests" into oc-dev

7 years agoAVRCP 1.6: Limit GetFolderItemResponse
Hemant Gupta [Tue, 25 Apr 2017 17:00:04 +0000 (17:00 +0000)]
AVRCP 1.6: Limit GetFolderItemResponse
am: 900c29e0f1

Change-Id: Id1168bea36eabde194320782b02912d70ba5f6bc

7 years agoMerge "Handle remote not supporting LL_SLAVE_FEATURE_REQ" am: e3caefe394 am: e8eb07a442
Jakub Pawlowski [Tue, 25 Apr 2017 10:45:29 +0000 (10:45 +0000)]
Merge "Handle remote not supporting LL_SLAVE_FEATURE_REQ" am: e3caefe394 am: e8eb07a442
am: 81afe08a4c

Change-Id: Ic274b92bb2356217d13c47eef91f6a81f0b84035

7 years agoMerge "Handle remote not supporting LL_SLAVE_FEATURE_REQ" am: e3caefe394
Jakub Pawlowski [Tue, 25 Apr 2017 10:42:59 +0000 (10:42 +0000)]
Merge "Handle remote not supporting LL_SLAVE_FEATURE_REQ" am: e3caefe394
am: e8eb07a442

Change-Id: Icd7c41ef5e8e4992973ad1d211d9c9d27e449e35

7 years agoMerge "Handle remote not supporting LL_SLAVE_FEATURE_REQ"
Jakub Pawlowski [Tue, 25 Apr 2017 10:40:29 +0000 (10:40 +0000)]
Merge "Handle remote not supporting LL_SLAVE_FEATURE_REQ"
am: e3caefe394

Change-Id: I15ab18d2f7aec748287c0420f143c4a57e8a0e4f

7 years agoMerge "Handle remote not supporting LL_SLAVE_FEATURE_REQ"
Treehugger Robot [Tue, 25 Apr 2017 10:35:03 +0000 (10:35 +0000)]
Merge "Handle remote not supporting LL_SLAVE_FEATURE_REQ"

7 years agoAdd missing library dependency when compiling the unit tests
Pavlin Radoslavov [Tue, 25 Apr 2017 00:37:20 +0000 (17:37 -0700)]
Add missing library dependency when compiling the unit tests

This fixes a compilation issue when compiling with ASAN enabled.

Bug: 37624756
Test: make -j 40  SANITIZE_TARGET='address coverage' tests
Change-Id: I9caa3d404e60ee105435539744ed2b8ccf353700
(cherry picked from commit 044921b223868595a6f96709020b46349b05fa45)

7 years agoAdd missing library dependency when compiling the unit tests am: 044921b223 am: 464a0...
Pavlin Radoslavov [Tue, 25 Apr 2017 05:10:07 +0000 (05:10 +0000)]
Add missing library dependency when compiling the unit tests am: 044921b223 am: 464a06af0b
am: 584e0f9d67

Change-Id: Ie986de26ad43fecd6062fe70bc7efafe658aa8b0

7 years agoAdd missing library dependency when compiling the unit tests am: 044921b223
Pavlin Radoslavov [Tue, 25 Apr 2017 05:08:37 +0000 (05:08 +0000)]
Add missing library dependency when compiling the unit tests am: 044921b223
am: 464a06af0b

Change-Id: Ib2486084fb69d73c897635cfbe7c3c0252a2a419

7 years agoAdd missing library dependency when compiling the unit tests
Pavlin Radoslavov [Tue, 25 Apr 2017 05:06:37 +0000 (05:06 +0000)]
Add missing library dependency when compiling the unit tests
am: 044921b223

Change-Id: I491edb09f445b5aca0948c134cb78a0334804043

7 years agoAVRCP 1.6: Limit GetFolderItemResponse
Hemant Gupta [Wed, 12 Apr 2017 18:26:15 +0000 (23:56 +0530)]
AVRCP 1.6: Limit GetFolderItemResponse

Usecase:
1) Connect from AVRCP Controller supporting browsing
   having low L2CAP MTU eg 672.
2) Request for get folder items with large request items,
   response for which will exceed MTU size.

Expected Result:
As per AVRCP 1.6 Spec, section 29.20 pg 178, response should be
limited to number of completed get folder items that can fit in
single AVCTP Browsing channel MTU even if the completed items
are less than actually requested by AVRCP Controller.

Observation:
DUT responding with Internal Error.

Root Cause:
When there is no space to fill complete Get Folder Item response
within MTU size, DUT was returning error.

Fix:
Send max completed items which can fit in single MTU packet.

Test: Checked if the remote device can receive the truncated
response and get folder items succeeds when remote device
reissues get folder item request with updated start list count.

Frequency: 5/5

Bug: 37304477
Change-Id: I1963f97075382fc8333038e3efffaf61a9d84a28
(cherry picked from commit a7c7437bbffe133f9192b9ca82b5b4e1f6d9835a)

7 years agoAdd missing library dependency when compiling the unit tests
Pavlin Radoslavov [Tue, 25 Apr 2017 00:37:20 +0000 (17:37 -0700)]
Add missing library dependency when compiling the unit tests

This fixes a compilation issue when compiling with ASAN enabled.

Bug: 37624756
Test: make -j 40  SANITIZE_TARGET='address coverage' tests
Change-Id: I9caa3d404e60ee105435539744ed2b8ccf353700

7 years agoAVRCP 1.6: Limit GetFolderItemResponse am: a7c7437bbf am: 0940c18aef
Hemant Gupta [Tue, 25 Apr 2017 00:12:47 +0000 (00:12 +0000)]
AVRCP 1.6: Limit GetFolderItemResponse am: a7c7437bbf am: 0940c18aef
am: c8c71c24bf

Change-Id: I24eba7b3270e82186f8d4c62ddf2fd4bd69c2812

7 years agoAVRCP 1.6: Limit GetFolderItemResponse am: a7c7437bbf
Hemant Gupta [Tue, 25 Apr 2017 00:10:46 +0000 (00:10 +0000)]
AVRCP 1.6: Limit GetFolderItemResponse am: a7c7437bbf
am: 0940c18aef

Change-Id: Ib239a2d16b5f89998cd92b0891217eda88b1ce3b

7 years agoAVRCP 1.6: Limit GetFolderItemResponse
Hemant Gupta [Tue, 25 Apr 2017 00:08:46 +0000 (00:08 +0000)]
AVRCP 1.6: Limit GetFolderItemResponse
am: a7c7437bbf

Change-Id: I6e0eedf6a7486aadcb6fabf214f1bafa2efd2233

7 years agoHandle remote not supporting LL_SLAVE_FEATURE_REQ
Jakub Pawlowski [Mon, 24 Apr 2017 13:34:11 +0000 (06:34 -0700)]
Handle remote not supporting LL_SLAVE_FEATURE_REQ

Test: for PTS
Change-Id: I3030a068c1c4980fa7cbb23b478afbe441584869

7 years agoAllow the Bluetooth MAC address to be updated asynchronously (3/3)
Stanley Tng [Sat, 22 Apr 2017 00:24:06 +0000 (00:24 +0000)]
Allow the Bluetooth MAC address to be updated asynchronously (3/3)
am: 514274c60b

Change-Id: I135b400c34abe5a5a1a403cc23600f5a73f05aa4

7 years agoAllow the Bluetooth MAC address to be updated asynchronously (3/3)
Stanley Tng [Tue, 18 Apr 2017 05:38:38 +0000 (22:38 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (3/3)

There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.

Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382

Change-Id: I7b1c526ee227897c003ac921078f317f96b92604
(cherry picked from commit 7dc0525365025e17e289869288b1b7d5146306cc)

7 years agoMerge "Merge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into...
Android Build Merger (Role) [Fri, 21 Apr 2017 21:10:14 +0000 (21:10 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into cw-f-dev am: b53535d61b  -s ours am: 1238329f28  -s ours am: 0e4602c0c9  -s ours" into oc-dev-plus-aosp

7 years agoMerge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into cw-f...
Zach Johnson [Fri, 21 Apr 2017 21:10:05 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into cw-f-dev am: b53535d61b  -s ours am: 1238329f28  -s ours
am: 0e4602c0c9  -s ours

Change-Id: Ic7c84d88c7b4a04091e223f2cee37d738a721ba1