OSDN Git Service

android-x86/system-bt.git
5 years agoMerge "Remove redundant GATT_StartIf" am: 76037ac30a am: 140ef6de01
Jakub Pawlowski [Fri, 14 Dec 2018 09:02:58 +0000 (01:02 -0800)]
Merge "Remove redundant GATT_StartIf" am: 76037ac30a am: 140ef6de01
am: fe23d4a41f

Change-Id: I5214468a65a8409b2c55d8bd05ce9e53d738aef5

5 years agoMerge "Remove redundant GATT_StartIf" am: 76037ac30a
Jakub Pawlowski [Fri, 14 Dec 2018 08:58:50 +0000 (00:58 -0800)]
Merge "Remove redundant GATT_StartIf" am: 76037ac30a
am: 140ef6de01

Change-Id: If37a2277d5fc63b38991f11e4b514531dd013f61

5 years agoMerge "Remove redundant GATT_StartIf"
Jakub Pawlowski [Fri, 14 Dec 2018 08:53:43 +0000 (00:53 -0800)]
Merge "Remove redundant GATT_StartIf"
am: 76037ac30a

Change-Id: I77e6f64ea666ce524fc11df625304db0c7f0d136

5 years agoMerge "Remove redundant GATT_StartIf"
Jakub Pawlowski [Fri, 14 Dec 2018 08:40:04 +0000 (08:40 +0000)]
Merge "Remove redundant GATT_StartIf"

5 years agoMerge "Pass package name as a part of startDiscovery" am: 62e1f765bc am: 98d86a5124
Zach Johnson [Thu, 13 Dec 2018 23:05:37 +0000 (15:05 -0800)]
Merge "Pass package name as a part of startDiscovery" am: 62e1f765bc am: 98d86a5124
am: d40ae4a97a

Change-Id: I9182cd72d3f89ef23e5474a8d8254ddd349543ff

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
Xin Li [Thu, 13 Dec 2018 22:26:12 +0000 (14:26 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: cb7dcad70d  -s ours am: 2f24d9ccc9  -s ours
am: 398a91b8cf  -s ours

Change-Id: I5f53c2d3019ced3e774362736529d2cbdd25a01e

5 years agoMerge "Pass package name as a part of startDiscovery" am: 62e1f765bc
Zach Johnson [Thu, 13 Dec 2018 22:08:15 +0000 (14:08 -0800)]
Merge "Pass package name as a part of startDiscovery" am: 62e1f765bc
am: 98d86a5124

Change-Id: Ie125c59f1da11fdfa118c817528e97b5e7c7396a

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
Xin Li [Thu, 13 Dec 2018 22:00:20 +0000 (14:00 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 1083b621e4  -s ours am: 193454c2f5  -s ours
am: 36aa4a532a  -s ours

Change-Id: Ib0d89e2da5af38dda9333b4419de3eefa36b661b

5 years agoRemove redundant GATT_StartIf
Jakub Pawlowski [Thu, 13 Dec 2018 16:53:15 +0000 (17:53 +0100)]
Remove redundant GATT_StartIf

GATT_StartIf is just sending connect callback about all currently
connected devices, even ones that this app is not interested in.

For btif/java apps, we will trigger connection attempt to just one
device right after registration, which would trigger connect callback
anyway.

For all bta layer apps, they do guard inside connect callback to make
sure code is triggered for already known device, but the devices are
considered as known only after they already connected, and some event
triggered app to create control block.

Thus, GATT_StartIf is surplus feature that should be removed.

Test: run all sl4a GATT tests
Change-Id: I8c45b92dbbf80894c32bb870eb392e766063c934

5 years agoMerge "Pass package name as a part of startDiscovery"
Zach Johnson [Thu, 13 Dec 2018 21:49:38 +0000 (13:49 -0800)]
Merge "Pass package name as a part of startDiscovery"
am: 62e1f765bc

Change-Id: I3911f27f80b99ab28c91bd8a56cceefba5357fe6

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
Xin Li [Thu, 13 Dec 2018 21:31:02 +0000 (13:31 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: cb7dcad70d  -s ours
am: 2f24d9ccc9  -s ours

Change-Id: Ifcdb0d9bc09fe02a35d7a21f2a6a612c392e4741

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
Xin Li [Thu, 13 Dec 2018 21:27:59 +0000 (13:27 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
am: cb7dcad70d  -s ours

Change-Id: I3937cd25882e43468acb0d0192a5ccd34aa59091

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
Xin Li [Thu, 13 Dec 2018 20:20:55 +0000 (12:20 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 1083b621e4  -s ours
am: 193454c2f5  -s ours

Change-Id: I9220d2fbd647f37883e3fae57dddccb57660990a

5 years agoFix performance-for-range-copy warnings am: 01a40403d7 am: 864618752b
Chih-Hung Hsieh [Thu, 13 Dec 2018 19:42:50 +0000 (11:42 -0800)]
Fix performance-for-range-copy warnings am: 01a40403d7 am: 864618752b
am: 9392c94d42

Change-Id: I5689191df82a5c02635d93dca34fb2cf6533eb52

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
Xin Li [Thu, 13 Dec 2018 19:25:51 +0000 (11:25 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 1083b621e4  -s ours

Change-Id: I050265331bd4a18405f7d6f93b03125a1fc659ae

5 years agoFix performance-for-range-copy warnings am: 01a40403d7
Chih-Hung Hsieh [Thu, 13 Dec 2018 19:08:56 +0000 (11:08 -0800)]
Fix performance-for-range-copy warnings am: 01a40403d7
am: 864618752b

Change-Id: I4d306d3f51fe634e5e638423400870b158098633

5 years agoFix performance-for-range-copy warnings
Chih-Hung Hsieh [Thu, 13 Dec 2018 18:48:26 +0000 (10:48 -0800)]
Fix performance-for-range-copy warnings
am: 01a40403d7

Change-Id: Ife0d8af7af4a5ac26dfe7d735bbc65460d1beb70

5 years agoMerge "Pass package name as a part of startDiscovery"
Treehugger Robot [Thu, 13 Dec 2018 12:42:58 +0000 (12:42 +0000)]
Merge "Pass package name as a part of startDiscovery"

5 years agoMerge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
Treehugger Robot [Thu, 13 Dec 2018 05:45:20 +0000 (05:45 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"

5 years agoPass package name as a part of startDiscovery
Zach Johnson [Thu, 13 Dec 2018 01:13:29 +0000 (17:13 -0800)]
Pass package name as a part of startDiscovery

Test: manual
Bug: 118347252
Change-Id: I52adf73009a9766ad9aabf41657187343a2d0f41

5 years agoFix performance-for-range-copy warnings
Chih-Hung Hsieh [Wed, 12 Dec 2018 22:30:52 +0000 (14:30 -0800)]
Fix performance-for-range-copy warnings

Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I7d5537c24c39d5c42ac17c8a67646e4b9321d6bb

5 years agoMerge "Fix the LE CoC SL4A Test failure due to length check"
TreeHugger Robot [Wed, 12 Dec 2018 20:10:33 +0000 (20:10 +0000)]
Merge "Fix the LE CoC SL4A Test failure due to length check"

5 years agoFix the LE CoC SL4A Test failure due to length check
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
Fix the LE CoC SL4A Test failure due to length check

Fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.

Bug: 117306992
Bug: 112321180
Test: Run the LE CoC SL4A Tests
Change-Id: I9bbcd58460a02394010f74a18e9ebdbcd546d43d

5 years agoTurn stack/gatt/conneciton_manager.cc into text file am: fef2539cd2 am: 534edf6f31
Jakub Pawlowski [Wed, 12 Dec 2018 08:49:26 +0000 (00:49 -0800)]
Turn stack/gatt/conneciton_manager.cc into text file am: fef2539cd2 am: 534edf6f31
am: f4de42f056

Change-Id: I6ed25412458c64963db439c3ad9efdc94649f7f5

5 years agoTurn stack/gatt/conneciton_manager.cc into text file am: fef2539cd2
Jakub Pawlowski [Wed, 12 Dec 2018 08:40:10 +0000 (00:40 -0800)]
Turn stack/gatt/conneciton_manager.cc into text file am: fef2539cd2
am: 534edf6f31

Change-Id: Ic61487b61dfa98f725f321c19f4818597c217079

5 years agoTurn stack/gatt/conneciton_manager.cc into text file
Jakub Pawlowski [Wed, 12 Dec 2018 08:30:59 +0000 (00:30 -0800)]
Turn stack/gatt/conneciton_manager.cc into text file
am: fef2539cd2

Change-Id: I95b2a8c2136819491f4aafc38e6fb0a782e898ec

5 years agoTurn stack/gatt/conneciton_manager.cc into text file
Jakub Pawlowski [Tue, 11 Dec 2018 20:53:58 +0000 (21:53 +0100)]
Turn stack/gatt/conneciton_manager.cc into text file

Change-Id: I031bfaa1745de55aeb0a0dbde3a7a67be0f9c982

5 years agoMerge changes I7f8b5cfd,I68d65028 am: 1b29fe6e18 am: b54f76358d
Myles Watson [Wed, 12 Dec 2018 05:32:33 +0000 (21:32 -0800)]
Merge changes I7f8b5cfd,I68d65028 am: 1b29fe6e18 am: b54f76358d
am: 8b414188c2

Change-Id: Ia52b9b4d3d6c9c84b2ad4e5d3db74704c15c41f9

5 years agoMerge changes I7f8b5cfd,I68d65028 am: 1b29fe6e18
Myles Watson [Wed, 12 Dec 2018 05:23:28 +0000 (21:23 -0800)]
Merge changes I7f8b5cfd,I68d65028 am: 1b29fe6e18
am: b54f76358d

Change-Id: I7246bf57da0ff7de9a9b05b8907a83529f22add7

5 years agoMerge changes I7f8b5cfd,I68d65028
Myles Watson [Wed, 12 Dec 2018 05:14:36 +0000 (21:14 -0800)]
Merge changes I7f8b5cfd,I68d65028
am: 1b29fe6e18

Change-Id: I00f505eb8b71e21e6a2bc778e41ee9a0f8e35fc3

5 years agoMerge changes I7f8b5cfd,I68d65028
Treehugger Robot [Wed, 12 Dec 2018 05:05:27 +0000 (05:05 +0000)]
Merge changes I7f8b5cfd,I68d65028

* changes:
  test_vendor: Add PacketBuilder classes
  test_vendor: Add PacketView for copyless parsing

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
Xin Li [Wed, 12 Dec 2018 01:06:05 +0000 (17:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: 42d037fe36  -s ours
am: 03e49faba0  -s ours

Change-Id: I335edb044b82506e55f79e01bb8b6eab1ae35050

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
Xin Li [Wed, 12 Dec 2018 00:40:56 +0000 (16:40 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
am: 42d037fe36  -s ours

Change-Id: Icaaa381f61330253cd78482818f27b8dfaebea9c

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
Xin Li [Tue, 11 Dec 2018 23:40:19 +0000 (15:40 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 79a563ab36  -s ours
am: 4dc0b65fc6  -s ours

Change-Id: I1bfc215061623d70307731eec60621bc5aa01be1

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
Xin Li [Tue, 11 Dec 2018 23:09:05 +0000 (15:09 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 79a563ab36  -s ours

Change-Id: I2a2a30bf46dbee8548e7196b98d7fad714f1b3b6

5 years agoDO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Xin Li [Tue, 11 Dec 2018 22:45:08 +0000 (14:45 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: Icdcf2220fd28f92b182da73bee207151e80db295

5 years agoMerge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp...
TreeHugger Robot [Tue, 11 Dec 2018 21:49:24 +0000 (21:49 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master

5 years agoMerge "Enable shadow call stack in system/bt."
TreeHugger Robot [Tue, 11 Dec 2018 21:41:12 +0000 (21:41 +0000)]
Merge "Enable shadow call stack in system/bt."

5 years agoMerge "OWNERS -eisenbach, +zachoverflow" am: 55c7b8ba5d am: b7d3381e10
Zach Johnson [Tue, 11 Dec 2018 09:47:39 +0000 (01:47 -0800)]
Merge "OWNERS -eisenbach, +zachoverflow" am: 55c7b8ba5d am: b7d3381e10
am: aab5a60b4b

Change-Id: I196ace14a45911ca4d8a9e331819715610f5364a

5 years agoMerge "OWNERS -eisenbach, +zachoverflow" am: 55c7b8ba5d
Zach Johnson [Tue, 11 Dec 2018 08:53:35 +0000 (00:53 -0800)]
Merge "OWNERS -eisenbach, +zachoverflow" am: 55c7b8ba5d
am: b7d3381e10

Change-Id: I61b86d30c6ebd0f2941292c5e42c6b2b84932688

5 years agoMerge "OWNERS -eisenbach, +zachoverflow"
Zach Johnson [Tue, 11 Dec 2018 08:26:18 +0000 (00:26 -0800)]
Merge "OWNERS -eisenbach, +zachoverflow"
am: 55c7b8ba5d

Change-Id: Ib3b6c7398a8a749ab6e19d202cde14250d3024dd

5 years agoMerge "OWNERS -eisenbach, +zachoverflow"
Zach Johnson [Tue, 11 Dec 2018 04:21:52 +0000 (04:21 +0000)]
Merge "OWNERS -eisenbach, +zachoverflow"

5 years agoFix GATT not working due to address mismatch am: f4b2f61690 am: aa88d9c532
Jakub Pawlowski [Tue, 11 Dec 2018 00:57:37 +0000 (16:57 -0800)]
Fix GATT not working due to address mismatch am: f4b2f61690 am: aa88d9c532
am: 396ce09f3e

Change-Id: Ied4413619c19ab3bd8d97e6adc67ce72c88fe266

5 years agoFix GATT not working due to address mismatch am: f4b2f61690
Jakub Pawlowski [Tue, 11 Dec 2018 00:30:08 +0000 (16:30 -0800)]
Fix GATT not working due to address mismatch am: f4b2f61690
am: aa88d9c532

Change-Id: Ifdf1d94dfb8553a371224520ffd87d3eade06011

5 years agoDO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Xin Li [Mon, 10 Dec 2018 22:22:38 +0000 (14:22 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534
Change-Id: I71b31fb1bf8a4c2b2f471b54b5a74bc2191c9693

5 years agoFix GATT not working due to address mismatch
Jakub Pawlowski [Tue, 11 Dec 2018 00:20:46 +0000 (16:20 -0800)]
Fix GATT not working due to address mismatch
am: f4b2f61690

Change-Id: Id435aecebda5a8cb5195353616bbfeb8ec9a87ec

5 years agotest_vendor: Add PacketBuilder classes
Myles Watson [Wed, 14 Nov 2018 00:56:38 +0000 (16:56 -0800)]
test_vendor: Add PacketBuilder classes

Templated PacketBuilder class for inserting fixed width
types with the correct endianness.

Test: rootcanal-packets_test_host --gtest_filter=*PacketBuilderEndian*
Change-Id: I7f8b5cfd225ebae35f310b44fc0782b940a23007

5 years agotest_vendor: Add PacketView for copyless parsing
Myles Watson [Wed, 7 Nov 2018 20:10:46 +0000 (12:10 -0800)]
test_vendor: Add PacketView for copyless parsing

A View is holds bounds and a shared pointer.
A PacketView is a forward list of View, templated for endianness.
A BaseIterator iterates over PacketViews.
An Iterator is a BaseIterator with extract, which is templated for endianness.

Test: rootcanal-packets_test_host
Change-Id: I68d6502861be61f411c0f5f2da33ead3d2392694

5 years agoOWNERS -eisenbach, +zachoverflow
Andre Eisenbach [Tue, 4 Sep 2018 17:17:20 +0000 (10:17 -0700)]
OWNERS -eisenbach, +zachoverflow

5 years agoMerge "Fix OOB in smp_proc_pair_fail"
TreeHugger Robot [Mon, 10 Dec 2018 14:17:52 +0000 (14:17 +0000)]
Merge "Fix OOB in smp_proc_pair_fail"

5 years agoFix GATT not working due to address mismatch
Jakub Pawlowski [Thu, 6 Dec 2018 18:32:37 +0000 (19:32 +0100)]
Fix GATT not working due to address mismatch

If the initial connection is established when using RPA, device can
later decide to use it's Identity Address for reconnections, if it
doesn't care about privacy.
When we receive such Identity Address, we must translate it into pseudo
address before passing it further down the stack.

Test: Connect to device using RPA, try to reconnect when it advertise
      it's Public address
Change-Id: Icb8eed25e1aad7003f1a3e0fed684168a8344544

5 years agoConfig: Reduce LOG(WARNING) to VLOG(1) when config key is not found am: fe8658175f...
Jack He [Mon, 10 Dec 2018 00:25:41 +0000 (16:25 -0800)]
Config: Reduce LOG(WARNING) to VLOG(1) when config key is not found am: fe8658175f am: 8034cb69c9
am: 3cb295c0f0

Change-Id: If8f9fa1168430e3da37b0c7b005f75d88e930fc9

5 years agoConfig: Reduce LOG(WARNING) to VLOG(1) when config key is not found am: fe8658175f
Jack He [Mon, 10 Dec 2018 00:20:37 +0000 (16:20 -0800)]
Config: Reduce LOG(WARNING) to VLOG(1) when config key is not found am: fe8658175f
am: 8034cb69c9

Change-Id: I0eabf65ac402c88d4d1b45f1e1afe751039619b6

5 years agoConfig: Reduce LOG(WARNING) to VLOG(1) when config key is not found
Jack He [Mon, 10 Dec 2018 00:15:32 +0000 (16:15 -0800)]
Config: Reduce LOG(WARNING) to VLOG(1) when config key is not found
am: fe8658175f

Change-Id: I87fd172353352e4ad79fcf801ebdcfcf7eefebbb

5 years agoConfig: Reduce LOG(WARNING) to VLOG(1) when config key is not found
Jack He [Fri, 7 Dec 2018 21:58:12 +0000 (13:58 -0800)]
Config: Reduce LOG(WARNING) to VLOG(1) when config key is not found

Fixes: 120495903
Test: make
Change-Id: I724b8883ea400ed3c79fe31b75f1e2aa65b45b4d

5 years agoMerge "RFCOMM: Check flow control length"
TreeHugger Robot [Fri, 7 Dec 2018 02:08:57 +0000 (02:08 +0000)]
Merge "RFCOMM: Check flow control length"

5 years agoEnable shadow call stack in system/bt.
Peter Collingbourne [Fri, 7 Dec 2018 01:04:43 +0000 (17:04 -0800)]
Enable shadow call stack in system/bt.

Shadow call stack (SCS) is a security mitigation that uses a separate
stack (the SCS) for return addresses.

This change causes libbluetooth-binder.so and libbluetooth.so to be
built with SCS.

For the moment this is an internal-only change until the AOSP kernels
can be fixed to not clobber x18.

Bug: 112907825
Bug: 120630739
Change-Id: I0b9e948f26b4430dd04f44ffc94abf96d2a7ee8f

5 years agoMerge "Preserve x18 while calling aptX encoder libraries." am: b1db2b8792 am: 77abe93228
Peter Collingbourne [Fri, 7 Dec 2018 01:28:52 +0000 (17:28 -0800)]
Merge "Preserve x18 while calling aptX encoder libraries." am: b1db2b8792 am: 77abe93228
am: 446f1715b5

Change-Id: I8f2f1cd8b9609b1e08835889db4ddc080058b648

5 years agoMerge "Preserve x18 while calling aptX encoder libraries." am: b1db2b8792
Peter Collingbourne [Fri, 7 Dec 2018 01:16:55 +0000 (17:16 -0800)]
Merge "Preserve x18 while calling aptX encoder libraries." am: b1db2b8792
am: 77abe93228

Change-Id: I85f99e6ebec86f0e682efc2ce105209f65406ae0

5 years agoMerge "Preserve x18 while calling aptX encoder libraries."
Peter Collingbourne [Fri, 7 Dec 2018 00:54:19 +0000 (16:54 -0800)]
Merge "Preserve x18 while calling aptX encoder libraries."
am: b1db2b8792

Change-Id: Ie19afe9335e95128fa4f0411e2c6e1f9758a9791

5 years agoMerge "Preserve x18 while calling aptX encoder libraries."
Peter Collingbourne [Fri, 7 Dec 2018 00:47:06 +0000 (00:47 +0000)]
Merge "Preserve x18 while calling aptX encoder libraries."

5 years agoPreserve x18 while calling aptX encoder libraries.
Peter Collingbourne [Mon, 19 Nov 2018 20:58:18 +0000 (12:58 -0800)]
Preserve x18 while calling aptX encoder libraries.

Shadow call stack (SCS) is a security mitigation that uses a
separate stack (the SCS) for return addresses. In versions of
Android newer than P, the compiler normally cooperates with the
system to ensure that the SCS address is always stored in register
x18. This requires that everything in a process that uses SCS is
built with -ffixed-x18. However, two libraries (libaptX_encoder.so
and libaptXHD_encoder.so) are supplied in binary format and were
not compiled with -ffixed-x18. We are working with the vendor to get
these libraries rebuilt with -ffixed-x18, but until then, we need to
prevent this library from clobbering x18 so that we can turn on SCS
in the Bluetooth process.

Bug: 112907825
Bug: 120621517
Change-Id: Id27829ed5696903c42b4aeb75c3b3880c97a3a36

5 years agoRFCOMM: Check flow control length
Myles Watson [Wed, 5 Dec 2018 18:26:27 +0000 (10:26 -0800)]
RFCOMM: Check flow control length

Change-Id: Iee6392d1d93dc57e28c54fffff80e9f38286d863
Fixes: 120276962
Test: Send a flow control packet with length 3

5 years agoMerge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off" am: b946c...
weichinweng [Thu, 6 Dec 2018 03:20:48 +0000 (19:20 -0800)]
Merge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off" am: b946c2690a am: 7f9d9ee31a
am: f96c776374

Change-Id: If0104c8e788fcb52d13a795100d3a7ebc8c45eee

5 years agoMerge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off" am: b946c...
weichinweng [Thu, 6 Dec 2018 03:15:34 +0000 (19:15 -0800)]
Merge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off" am: b946c2690a
am: 7f9d9ee31a

Change-Id: I90ac257edb6cb5a2fa1618f6b6b877d68ccd1237

5 years agoMerge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off"
weichinweng [Thu, 6 Dec 2018 03:07:23 +0000 (19:07 -0800)]
Merge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off"
am: b946c2690a

Change-Id: Ied576f7bc2ba217facb6a2d16ccd4e2734b57a3f

5 years agoMerge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off"
Treehugger Robot [Thu, 6 Dec 2018 02:43:24 +0000 (02:43 +0000)]
Merge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off"

5 years agoMerge "Enable bounds sanitization in Bluetooth." am: ec74937aa0 am: ffd2e4684b
Ivan Lozano [Thu, 6 Dec 2018 00:38:35 +0000 (16:38 -0800)]
Merge "Enable bounds sanitization in Bluetooth." am: ec74937aa0 am: ffd2e4684b
am: d3b2b05194

Change-Id: Ibaa0ece672974adb35b8781c443d48892e043608

5 years agoMerge "Enable bounds sanitization in Bluetooth." am: ec74937aa0
Ivan Lozano [Thu, 6 Dec 2018 00:11:43 +0000 (16:11 -0800)]
Merge "Enable bounds sanitization in Bluetooth." am: ec74937aa0
am: ffd2e4684b

Change-Id: I0ab2bdd59ac82843e4e807e91e5237c905dce99a

5 years agoMerge "Enable bounds sanitization in Bluetooth."
Ivan Lozano [Wed, 5 Dec 2018 23:58:50 +0000 (15:58 -0800)]
Merge "Enable bounds sanitization in Bluetooth."
am: ec74937aa0

Change-Id: Ie1a58ea6002a2ce5ba36d9a5ca870a6db1fc4614

5 years agoMerge "Enable bounds sanitization in Bluetooth."
Ivan Lozano [Wed, 5 Dec 2018 23:38:16 +0000 (23:38 +0000)]
Merge "Enable bounds sanitization in Bluetooth."

5 years agoMerge "Group BR-EDR related SDP variables under transport" am: 1068f028e1 am: 080e937008
Srinu Jella [Wed, 5 Dec 2018 22:43:47 +0000 (14:43 -0800)]
Merge "Group BR-EDR related SDP variables under transport" am: 1068f028e1 am: 080e937008
am: 03ce0fbad4

Change-Id: Iddc534fdae7a9d74ca5f9e2c804f8090a0732ede

5 years agoMerge "Group BR-EDR related SDP variables under transport" am: 1068f028e1
Srinu Jella [Wed, 5 Dec 2018 22:39:14 +0000 (14:39 -0800)]
Merge "Group BR-EDR related SDP variables under transport" am: 1068f028e1
am: 080e937008

Change-Id: I34def9279e8d4ca4d20e054387bd67ba772cd481

5 years agoMerge "Group BR-EDR related SDP variables under transport"
Srinu Jella [Wed, 5 Dec 2018 22:30:51 +0000 (14:30 -0800)]
Merge "Group BR-EDR related SDP variables under transport"
am: 1068f028e1

Change-Id: Idb6f348ffea7350cbc6ae8e9fbf24938d8f6a2c9

5 years agoMerge "Group BR-EDR related SDP variables under transport"
Treehugger Robot [Wed, 5 Dec 2018 22:04:09 +0000 (22:04 +0000)]
Merge "Group BR-EDR related SDP variables under transport"

5 years agoMerge "Fix OOB in process_l2cap_cmd"
TreeHugger Robot [Wed, 5 Dec 2018 08:40:23 +0000 (08:40 +0000)]
Merge "Fix OOB in process_l2cap_cmd"

5 years agoMetrics: Fix a typo in log am: 015dd9392f am: ff61d33a86
Jack He [Wed, 5 Dec 2018 02:25:01 +0000 (18:25 -0800)]
Metrics: Fix a typo in log am: 015dd9392f am: ff61d33a86
am: 05a83062e2

Change-Id: I03440e6a879514a0f1efa6a90b31a6c6ef471e5c

5 years agoMetrics: Fix a typo in log am: 015dd9392f
Jack He [Wed, 5 Dec 2018 02:20:56 +0000 (18:20 -0800)]
Metrics: Fix a typo in log am: 015dd9392f
am: ff61d33a86

Change-Id: Ie893a70b38dd8a26e25190c694bf5b205cff64e1

5 years agoMetrics: Fix a typo in log
Jack He [Wed, 5 Dec 2018 02:15:51 +0000 (18:15 -0800)]
Metrics: Fix a typo in log
am: 015dd9392f

Change-Id: Ib15c2fad51eb1569dfa9589fc39bb7595ed2c5bc

5 years agoMerge "Fix possible OOB when receive SMP data"
TreeHugger Robot [Wed, 5 Dec 2018 02:07:32 +0000 (02:07 +0000)]
Merge "Fix possible OOB when receive SMP data"

5 years agoMetrics: Fix a typo in log
Jack He [Tue, 4 Dec 2018 22:30:28 +0000 (14:30 -0800)]
Metrics: Fix a typo in log

Test: make
Change-Id: I92a49c62ebf13d8da7f13b39c426d0eb14a83db6

5 years agoMerge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG...
Bill Rassieur [Tue, 4 Dec 2018 17:00:02 +0000 (17:00 +0000)]
Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245

Change-Id: I39b32c98eac813e96ba19087a27c97d0da02ab5e

5 years agoGroup BR-EDR related SDP variables under transport
Srinu Jella [Thu, 11 Feb 2016 14:17:39 +0000 (19:47 +0530)]
Group BR-EDR related SDP variables under transport

Use Case: Random RNR initiated after HOGP Keyboard disconnection

steps:
1. keep madcatz in advertisement mode and scan, pair from DUT.
2. keep dailog Keyboard in advertisement mode and scan, pair from DUT.
3. Take Keyboard out of range to initiate disconnection from remote
or initiate disconnection from remote.

Failure: DUT trying to do RNR to random device.

Root Cause: when the disconnection happened for LE device, it sets
the wait_disc to true, that is causing random RNR to go for BR-EDR
device.

Fix: Group all BR-EDR related SDP variables under transport check
so that if some other operation on LE will not corrupt these BR-EDR
variables to mislead.

Test: code compilation.
Bug: 69031582
Change-Id: Ic9003f2b85bbaaa30b201b8a639a9d9b52055ac5

5 years agoSplit Timer into OnceTimer and RepeatingTimer am: 5cf0304979 am: 51de60ce31
Jakub Pawlowski [Tue, 4 Dec 2018 11:19:54 +0000 (03:19 -0800)]
Split Timer into OnceTimer and RepeatingTimer am: 5cf0304979 am: 51de60ce31
am: ef8b143e49

Change-Id: I0ab31466ba69868673d9ad7ca3ee7f7093c9b231

5 years agoSplit Timer into OnceTimer and RepeatingTimer am: 5cf0304979
Jakub Pawlowski [Tue, 4 Dec 2018 10:55:54 +0000 (02:55 -0800)]
Split Timer into OnceTimer and RepeatingTimer am: 5cf0304979
am: 51de60ce31

Change-Id: I90fa25a2d9bae98429a8486e5b74799d6b2537d5

5 years agoSplit Timer into OnceTimer and RepeatingTimer
Jakub Pawlowski [Tue, 4 Dec 2018 10:42:23 +0000 (02:42 -0800)]
Split Timer into OnceTimer and RepeatingTimer
am: 5cf0304979

Change-Id: Ie3d704b95231953a8cb602cc0b279a94a6f8081a

5 years agoSplit Timer into OnceTimer and RepeatingTimer
Jakub Pawlowski [Mon, 3 Dec 2018 15:50:40 +0000 (16:50 +0100)]
Split Timer into OnceTimer and RepeatingTimer

Follow the naming convention in libbase, where Callback was split into
OnceCallback, and RepeatingCallback, to make it obvious how many times
callback is expected to be called.

Test: unit tests were split from TimerTest into OnceTimerTest and
RepeatingTimerTest
Bug: 110303473
Change-Id: Ibbb9bb74a2e6e1a0f0f74c6ec44f63c5a4a1537f

5 years agoHearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off
weichinweng [Tue, 27 Nov 2018 05:47:25 +0000 (13:47 +0800)]
Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off

* On some condition, BT will stay on BLE_ON state when BT turn off. For
the case, Hearing Aid should be correctly disconnected and ctrl UIPC
close until next BT turn on.
* This CL add clear BtaGATTQueue and Close GATTC to make sure Queue
clean and HA enter disconnected state. And don't restart ctrl UIPC if
HearingAid is shutdown.

Bug: 118803637
Test: make, BT off/on when play A2DP and an app registered.
Change-Id: I1c52307637ee6b34222de9308dcfe1392ad170e8

5 years agoTest: Save SSR dump after test am: 268b88c948 am: 6e814aaa7d
Jack He [Sat, 1 Dec 2018 00:24:11 +0000 (16:24 -0800)]
Test: Save SSR dump after test am: 268b88c948 am: 6e814aaa7d
am: 1eab7e418e

Change-Id: I815a7d551cbfe6a0036b69b06183cb4f4b0f0cd5

5 years agoTest: Save SSR dump after test am: 268b88c948
Jack He [Sat, 1 Dec 2018 00:20:25 +0000 (16:20 -0800)]
Test: Save SSR dump after test am: 268b88c948
am: 6e814aaa7d

Change-Id: I8f482dd5e4a97779b64b23c22bfa14fe05617978

5 years agoTest: Save SSR dump after test
Jack He [Sat, 1 Dec 2018 00:17:05 +0000 (16:17 -0800)]
Test: Save SSR dump after test
am: 268b88c948

Change-Id: I34ae79fdf0fcdb246d8be40970b785d9dee92e9b

5 years agoAdd OOB check in avrc_pars_browse_rsp am: f44cbb20e7 am: 45a3f8a6fd am: 845fc7c234...
Ugo Yu [Fri, 30 Nov 2018 21:49:29 +0000 (13:49 -0800)]
Add OOB check in avrc_pars_browse_rsp am: f44cbb20e7 am: 45a3f8a6fd am: 845fc7c234 am: f7d26fe477
am: 8429b3df50

Change-Id: I98e65d6379e8ab13ba41e73c7f3c4cad32e6535b

5 years agoAdd OOB check in avrc_pars_browse_rsp am: f44cbb20e7 am: 45a3f8a6fd am: 845fc7c234
Ugo Yu [Fri, 30 Nov 2018 21:39:23 +0000 (13:39 -0800)]
Add OOB check in avrc_pars_browse_rsp am: f44cbb20e7 am: 45a3f8a6fd am: 845fc7c234
am: f7d26fe477

Change-Id: I18e346ddf845ea055610457effb51437b6bb8fec

5 years agoAdd OOB check in avrc_pars_browse_rsp am: f44cbb20e7 am: 45a3f8a6fd
Ugo Yu [Fri, 30 Nov 2018 21:27:11 +0000 (13:27 -0800)]
Add OOB check in avrc_pars_browse_rsp am: f44cbb20e7 am: 45a3f8a6fd
am: 845fc7c234

Change-Id: I4e6e5da28d3aaa25c9f5522385ae098b4c8362cc

5 years agoAdd OOB check in avrc_pars_browse_rsp am: f44cbb20e7
Ugo Yu [Fri, 30 Nov 2018 21:23:05 +0000 (13:23 -0800)]
Add OOB check in avrc_pars_browse_rsp am: f44cbb20e7
am: 45a3f8a6fd

Change-Id: Ibb3ff9d8915ab9129e890b04848dd78891262e28

5 years agoAdd OOB check in avrc_pars_browse_rsp
Ugo Yu [Fri, 30 Nov 2018 21:13:52 +0000 (13:13 -0800)]
Add OOB check in avrc_pars_browse_rsp
am: f44cbb20e7

Change-Id: Ieabff141ded21319a946fa0829bdb60cdedd8e9b

5 years agoTest: Save SSR dump after test
Jack He [Fri, 30 Nov 2018 00:51:22 +0000 (16:51 -0800)]
Test: Save SSR dump after test

* Save SSR dump from /data/vendor/ssrdump after test invocation

Bug: 120098494
Test: atest :postsubmit
Change-Id: Iafc1666c8cc9fbc7f69b909be630b3d0c1445fe4

5 years agoAdd OOB check in avrc_pars_browse_rsp
Ugo Yu [Tue, 13 Nov 2018 12:03:28 +0000 (20:03 +0800)]
Add OOB check in avrc_pars_browse_rsp

Bug: 111451066
Test: Manully
Change-Id: I068d218b8957bb8f053148d252a9119a8def28cc

5 years agoMerge "Metrics: Add Bluetooth address obfuscator" am: 17d56d8962 am: 14b03ef16c
Jack He [Fri, 30 Nov 2018 09:16:09 +0000 (01:16 -0800)]
Merge "Metrics: Add Bluetooth address obfuscator" am: 17d56d8962 am: 14b03ef16c
am: f5ea2d685b

Change-Id: I5a1ecff1d72e52527e9cdc8443b6c6979690bb12

5 years agoFix OOB in process_l2cap_cmd
Chienyuan [Fri, 30 Nov 2018 09:08:22 +0000 (17:08 +0800)]
Fix OOB in process_l2cap_cmd

Bug: 111215173
Test: manual
Change-Id: I98c122fea64cb33a9b0986254685091bcc8a951b