OSDN Git Service
Chris Manton [Fri, 11 Sep 2020 15:10:50 +0000 (08:10 -0700)]
Move connection_manager access into stack/acl/btm_acl
Add acl layer between l2cap and connection_manager
From: stack/l2cap/l2c_ble
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I7680892626b81a90907a0071a016160fae3cb506
Chris Manton [Sun, 13 Sep 2020 22:46:17 +0000 (15:46 -0700)]
Remove immaterial stack/btu/btu_hcif::HCI_TRACE_EVENT
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I66d31272ac21c4a60d92e5d862514cf248728e83
Chris Manton [Sun, 13 Sep 2020 22:48:50 +0000 (15:48 -0700)]
Remove immaterial stack/btu/btm_ble_addr::BTM_TRACE_EVENT
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I40a0ed7e015e55e56b389011038f5323666a4f1b
Chris Manton [Mon, 14 Sep 2020 17:17:32 +0000 (10:17 -0700)]
Add text hci error code logging
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Idc6801ba860a4f96554431c1dbd408a8e651a6e1
Chris Manton [Mon, 7 Sep 2020 16:37:31 +0000 (09:37 -0700)]
Add getters to stack/btm/security_device_record::tBTM_SEC_DEV_REC
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ia024a6977d606714f7edc58ded09f82a95703324
Chris Manton [Thu, 10 Sep 2020 23:25:36 +0000 (16:25 -0700)]
Remove useless #def BTM_IS_BRCM_CONTROLLER
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ic3f54bab7f13cde30b3089ca41bc5b4b1e33a2e8
Chris Manton [Thu, 10 Sep 2020 23:23:45 +0000 (16:23 -0700)]
Move BTM_IS_BRCM_CONTROLLER to end usecase
From: stack/btm/security_device_record.h
Into: stack/l2cap/l2c_utils.cc
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I4c69507efdabc35d7e7f393ac3e92481a0666d98
Chris Manton [Thu, 10 Sep 2020 21:53:43 +0000 (14:53 -0700)]
Remove unused #defs _DM_LE_KEY_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Id8ea36ffcd227d522282a7ff24997e5c29bca4c8
Chris Manton [Thu, 10 Sep 2020 20:50:24 +0000 (13:50 -0700)]
Remove unnecessary #def BTA_LE_KEY_
=>BTM_LE_KEY_
BTM_LE_KEY_PENC == BTA_LE_KEY_PENC == BTIF_DM_LE_KEY_PENC
BTM_LE_KEY_PID == BTA_LE_KEY_PID == BTIF_DM_LE_KEY_PID
BTM_LE_KEY_PCSRK == BTA_LE_KEY_PCSRK == BTIF_DM_LE_KEY_PCSRK
BTM_LE_KEY_LENC == BTA_LE_KEY_LENC == BTIF_DM_LE_KEY_LENC
BTM_LE_KEY_LID == BTA_LE_KEY_LID == BTIF_DM_LE_KEY_LID
BTM_LE_KEY_LCSRK == BTA_LE_KEY_LCSRK == BTIF_DM_LE_KEY_LCSRK
Towards fewer aliases
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: If4295f807a8b05c35ce4dbb333973730d9f77221
Chris Manton [Thu, 10 Sep 2020 20:40:36 +0000 (13:40 -0700)]
Remove unnecessary #def BTIF_DM_LE_KEY_
=>BTM_LE_KEY_
BTM_LE_KEY_PENC == BTA_LE_KEY_PENC == BTIF_DM_LE_KEY_PENC
BTM_LE_KEY_PID == BTA_LE_KEY_PID == BTIF_DM_LE_KEY_PID
BTM_LE_KEY_PCSRK == BTA_LE_KEY_PCSRK == BTIF_DM_LE_KEY_PCSRK
BTM_LE_KEY_LENC == BTA_LE_KEY_LENC == BTIF_DM_LE_KEY_LENC
BTM_LE_KEY_LID == BTA_LE_KEY_LID == BTIF_DM_LE_KEY_LID
BTM_LE_KEY_LCSRK == BTA_LE_KEY_LCSRK == BTIF_DM_LE_KEY_LCSRK
Towards fewer aliases
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8e0acad049b7c5d816a5244825bcd0b9028e3a25
Chris Manton [Thu, 10 Sep 2020 18:09:32 +0000 (11:09 -0700)]
Remove unused #defs stack/include/sdpdefs::
Towards flattening Everything
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifd2a529f0d3a73a024a7c38f2bf0c59918371a02
Chris Manton [Wed, 9 Sep 2020 23:13:50 +0000 (16:13 -0700)]
Log "device" btif/src/btif_config.c::btif_get_device_type
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ied237375c1dd9ceeab483f5af4b9f61637e9779c
Chris Manton [Wed, 9 Sep 2020 06:02:06 +0000 (23:02 -0700)]
Remove unused #def BTM_MAX_VENDOR_SPECIFIC_LEN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If93c2b232e9736728fd4dccc2a10bfa9fbf1365b
Chris Manton [Sat, 12 Sep 2020 23:26:35 +0000 (16:26 -0700)]
Set default tag to 'bluetooth'
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I65fbd9338482300e176e5afbd904a34e363e92bb
Chris Manton [Sat, 12 Sep 2020 21:47:10 +0000 (14:47 -0700)]
Replace #def btif/src/btif_sock_thread::APPL_TRACE_DEBUG
Useless information emitted
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iadbfd57310e7e592a47aa4502a089316cb36610f
Chris Manton [Thu, 10 Sep 2020 16:50:09 +0000 (09:50 -0700)]
Remove unused #defs bta/include/bta_api::
Towards flattening BTA
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic16b804cd1b7356a8d3a7a59ede0b092cd3eee7d
Chris Manton [Thu, 10 Sep 2020 17:45:23 +0000 (10:45 -0700)]
Remove unused #defs stack/smp::
Towards flattening SMP
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic9d5cca65372dcf73fd44dfdacac8b92d59e3f33
HsingYuan Lo [Thu, 17 Sep 2020 08:54:04 +0000 (16:54 +0800)]
Refactor adding ext prop descriptor
In oder to make db hash easier for unit testing
1. Creare a new API to add ext prop descriptor
2. Move the extended properties check to gatt_api.cc
Test: compile
Tag: #refactor
Bug:
110864501
Change-Id: I7afd748e3cd6f6588a30c0f255da4f2ab4b9376c
Treehugger Robot [Wed, 16 Sep 2020 23:43:59 +0000 (23:43 +0000)]
Merge "SDP_SERVER_ENABLED is always true"
Treehugger Robot [Wed, 16 Sep 2020 18:28:21 +0000 (18:28 +0000)]
Merge "gd: Change AdvertiserId type to uint8_t"
Treehugger Robot [Wed, 16 Sep 2020 18:28:16 +0000 (18:28 +0000)]
Merge "gd: add shim layer for LE advertising manager"
Treehugger Robot [Wed, 16 Sep 2020 18:27:44 +0000 (18:27 +0000)]
Merge "gd: add LE advertising callback"
Hansong Zhang [Wed, 9 Sep 2020 20:07:47 +0000 (13:07 -0700)]
SDP_SERVER_ENABLED is always true
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I22fa27b8eeab933b4529e6dec423327721428d8f
Chienyuan [Wed, 16 Sep 2020 09:10:43 +0000 (17:10 +0800)]
gd: Change AdvertiserId type to uint8_t
Tag: #gd-refactor
Bug:
159815595
Test: gd/cert/run --host
Change-Id: Ie0aaaebe89e712c648a3be0217d2a2394a5a9085
Chienyuan [Tue, 15 Sep 2020 12:05:42 +0000 (20:05 +0800)]
gd: add shim layer for LE advertising manager
Tag: #refactor
Bug:
159815595
Test: manual
Change-Id: Ib969d1ffe17c97b326d5553da3b054461e1039af
Chienyuan [Tue, 15 Sep 2020 09:43:14 +0000 (17:43 +0800)]
gd: add LE advertising callback
Tag: #gd-refactor
Bug:
159815595
Test: gd/cert/run --host
Change-Id: I780bbe31b28374f18feb353250c1ef7c5b253e8d
Chris Manton [Sat, 5 Sep 2020 19:24:46 +0000 (12:24 -0700)]
Fix likely-unhit memory leak
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I0cbaf43e04b42468c8588d0dd8b13001ee10229d
Chris Manton [Wed, 9 Sep 2020 15:39:48 +0000 (08:39 -0700)]
Remove #def code conditional BT_MAX_SERVICE_NAME_LEN
Ok for constants, poor for code conditionals
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I1e3c7848932ba160411c86243b374d7b5f84403c
Chris Manton [Wed, 9 Sep 2020 15:37:22 +0000 (08:37 -0700)]
Replace #def BTM_SEC_SERVICE_NAME_LEN
BTM_SEC_SERVICE_NAME_LEN == BT_MAX_SERVICE_NAME_LEN
Use: BT_MAX_SERVICE_NAME_LEN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I60e08e99d10cd2521beb7bbeaffe2263eabdd22d
Chris Manton [Tue, 8 Sep 2020 05:51:14 +0000 (22:51 -0700)]
Add header declarations
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ic0897e2cbfe1a61697d3837fceb40138b60783c2
Chris Manton [Thu, 3 Sep 2020 16:41:47 +0000 (09:41 -0700)]
Remove unused def L2CAP_WAKE_PARKED_LINK
Because when false untested hence unsupported
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ie24b10ed24230616f9f086b2463b09c37eb57e6f
Chris Manton [Fri, 4 Sep 2020 17:47:35 +0000 (10:47 -0700)]
Remove unused return val btif/src::btsock_thread_init
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Iddcc2af04bc397eedb29e9ddaf78abf8215ac045
Treehugger Robot [Tue, 15 Sep 2020 19:52:40 +0000 (19:52 +0000)]
Merge "bnep_disconnect_cfm does nothing"
Treehugger Robot [Tue, 15 Sep 2020 19:52:16 +0000 (19:52 +0000)]
Merge "Remove the empty line"
Treehugger Robot [Tue, 15 Sep 2020 18:27:26 +0000 (18:27 +0000)]
Merge "GD Reactor: Fix a potential use-after-free"
Treehugger Robot [Tue, 15 Sep 2020 13:11:44 +0000 (13:11 +0000)]
Merge "RootCanal: Add Iso command support for CIG/CIS"
Hansong Zhang [Mon, 14 Sep 2020 22:17:07 +0000 (15:17 -0700)]
GD Reactor: Fix a potential use-after-free
When a Reactable is freed, we cannot unlock its internal mutex.
Bug:
168271357
Tag: #gd-refactor
Test: cert/run --host
Change-Id: I4606965f0f3a73411068311fcaced570627e9679
Hansong Zhang [Mon, 14 Sep 2020 20:12:09 +0000 (13:12 -0700)]
Remove the empty line
To avoid a merge conflict
Test: compile
Change-Id: I7cab2bd47574850e390ffc3673eaeb3d2941ef24
Hansong Zhang [Mon, 14 Sep 2020 20:00:51 +0000 (13:00 -0700)]
bnep_disconnect_cfm does nothing
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibd034d08df8b34d3b97b0a39ae0bb10cf0e4ac51
Martin Brabham [Thu, 10 Sep 2020 20:28:05 +0000 (13:28 -0700)]
GD SMC: Only call Hold for outgoing Link
If we get a call for an incoming Link we do
not want to hold unless we want to do something with it.
Holding incoming connections can result in never Releasing
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I6607c79e7b3af77334fcc871c0bfe31406050978
Haibo Huang [Mon, 14 Sep 2020 18:12:02 +0000 (18:12 +0000)]
Merge "Using DoAll"
Haibo Huang [Thu, 10 Sep 2020 22:13:10 +0000 (15:13 -0700)]
Using DoAll
The new googletest correctly put DoAll in testing namespace.
Exempt-From-Owner-Approval: upgrade
Change-Id: Icff28cf7b160e1016bc88fb8c705575c19ccb734
Chris Manton [Tue, 8 Sep 2020 05:53:25 +0000 (22:53 -0700)]
Add btm_dev and btm_sco hci links
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Idf49d35eaf6a994c5e8904e9d657f5f144707d27
Chris Manton [Tue, 8 Sep 2020 05:54:17 +0000 (22:54 -0700)]
add neighbor_inquiry API
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6a51831e104a57f1f28c0badd215da63edee6c67
Chris Manton [Tue, 8 Sep 2020 05:50:08 +0000 (22:50 -0700)]
Add various function declarations
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib65e0d1947b94fb94abea6f1e40946b253e77741
Chris Manton [Mon, 7 Sep 2020 21:04:35 +0000 (14:04 -0700)]
Add stack/btm/neighbor_inquiry.h
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I828e59a5c5b630b7936b85bf1dc045b1bff136eb
Chris Manton [Mon, 7 Sep 2020 21:50:07 +0000 (14:50 -0700)]
Include btm_sec when required
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4fd392d1ae084e06f6ccbdd3c7fc1aef013b7569
Chris Manton [Mon, 7 Sep 2020 21:49:19 +0000 (14:49 -0700)]
Profusely Provide Proper Prototypes
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1e7e406efc87300271da9dafd42023ee281c8d7f
Martin Brabham [Fri, 11 Sep 2020 23:29:06 +0000 (23:29 +0000)]
Merge changes from topic "gd_security_shim"
* changes:
Add NameDbModule as dependency
Additional trigger on IO Capability Response
BTIF DM: Shim out link key management functions
Treehugger Robot [Fri, 11 Sep 2020 22:50:23 +0000 (22:50 +0000)]
Merge changes Ifc9c95d0,I0145e752,I7076dd5c,I55b07770
* changes:
Add ISO connection request and response
RootCanal: Remove acl namespace
RootCanal: Remove hci namespace
HCI: Change CIS phy type parameters
Treehugger Robot [Fri, 11 Sep 2020 21:13:37 +0000 (21:13 +0000)]
Merge "Remove unused type tBTM_INQ_TYPE"
Myles Watson [Thu, 10 Sep 2020 05:10:31 +0000 (22:10 -0700)]
RootCanal: Add Iso command support for CIG/CIS
Bug:
163818400
Test: cert/run --host
Tag: #feature
Change-Id: I16ead9bbd66b8fe6e32c0e01dd6841c909079738
Treehugger Robot [Fri, 11 Sep 2020 20:20:27 +0000 (20:20 +0000)]
Merge "Remove unused API in l2c_api shim"
Martin Brabham [Thu, 3 Sep 2020 21:06:09 +0000 (14:06 -0700)]
Add NameDbModule as dependency
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I6524577d1395d8fb82f5ec5ed6a53fe7dac97f06
Martin Brabham [Tue, 8 Sep 2020 04:03:29 +0000 (21:03 -0700)]
Additional trigger on IO Capability Response
In some cases IO Capability Response indicates
a pairing session.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: Ib3a4bddafcb31f344fe4fbbb6441ce9c8e368344
Myles Watson [Wed, 19 Aug 2020 22:55:56 +0000 (15:55 -0700)]
Add ISO connection request and response
Bug:
163818400
Test: cert/run --host
Tag: #feature
Change-Id: Ifc9c95d075117c629949dbdf9a8b50313f12966a
Myles Watson [Thu, 10 Sep 2020 00:42:55 +0000 (17:42 -0700)]
RootCanal: Remove acl namespace
Bug:
163818400
Test: cert/run --host
Tag: #feature
Change-Id: I0145e75223f90c6ab161bb08a5339e4a06b9a1e4
Myles Watson [Wed, 9 Sep 2020 23:21:17 +0000 (16:21 -0700)]
RootCanal: Remove hci namespace
Bug:
163818400
Test: cert/run --host
Tag: #feature
Change-Id: I7076dd5c3981359c2170ec70b2d280a0363bdddc
Myles Watson [Thu, 10 Sep 2020 00:46:53 +0000 (17:46 -0700)]
HCI: Change CIS phy type parameters
Bug:
163818400
Test: compare with spec
Tag: #feature
Change-Id: I55b07770bd710d5061aedcbad671e9201e53f0e0
Martin Brabham [Wed, 2 Sep 2020 17:59:24 +0000 (10:59 -0700)]
BTIF DM: Shim out link key management functions
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: If9ee277c0eef2e6ef14d4f6659d01be9651e48cb
Chris Manton [Mon, 7 Sep 2020 20:42:14 +0000 (13:42 -0700)]
Remove unused type tBTM_INQ_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic141e864ea610ae73d8e77a561ae0206face3453
Chris Manton [Mon, 7 Sep 2020 20:38:51 +0000 (13:38 -0700)]
Move tINQ_BDADDR from security record
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I612f181f20f9647defd0b034763fcc549b3543f3
Chris Manton [Mon, 7 Sep 2020 20:35:17 +0000 (13:35 -0700)]
Move tBTM_DEVCB from security device record
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icfbede72d98a400e2e2458c2cb8e8d841bd4bf77
Chris Manton [Mon, 7 Sep 2020 20:30:45 +0000 (13:30 -0700)]
Remove unused tBTM_DEVCB::le_supported_states
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I857ee94c9f7fab53fcb1f3ac421511186c87bed8
Xin Li [Thu, 10 Sep 2020 17:21:54 +0000 (17:21 +0000)]
Merge "Merge Android R"
Chris Manton [Tue, 8 Sep 2020 04:52:15 +0000 (21:52 -0700)]
Add inquiry to hci link interface
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib85874197d405b449a973c935af9fcf124650cd3
Chris Manton [Tue, 8 Sep 2020 04:51:26 +0000 (21:51 -0700)]
Properly include stack/include/acl_api
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9e1e9271055924568b1c315c8e550c49a38bf32b
Xin Li [Thu, 10 Sep 2020 03:21:27 +0000 (20:21 -0700)]
Merge Android R
Bug:
168057903
Merged-In: I9d9a661e1106db1b531069a5038f957a009bd3c3
Change-Id: Ib2df8c5a003107b16708ecf51e3f6e7f4df66119
Chris Manton [Mon, 7 Sep 2020 19:43:08 +0000 (12:43 -0700)]
Straighten out tBTM_BOND_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7e230c8c5a621d54c10cb80b92193a941f731a1a
Chris Manton [Mon, 7 Sep 2020 19:39:01 +0000 (12:39 -0700)]
Move acl only #defs BTM_ACL
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I70efdaa1f6907e9cd5f394c7d90a1a97bce202ad
Chris Manton [Wed, 9 Sep 2020 22:33:13 +0000 (22:33 +0000)]
Remove unused def BTM_MAX_SCN am:
2313c9ab4c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421034
Change-Id: I9d9a661e1106db1b531069a5038f957a009bd3c3
Chris Manton [Wed, 9 Sep 2020 22:32:33 +0000 (22:32 +0000)]
Remove unnecessary #def BTM_MAX_SCN am:
20d12d7e33
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421033
Change-Id: If9c39b93adeb36354e2f82afcd8255574e23a623
Chris Manton [Wed, 9 Sep 2020 20:34:07 +0000 (20:34 +0000)]
Break out stack/btm/btm_sco.h am:
2223760845
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421032
Change-Id: Iaa4ac61a7fd95f2b80f48bdb6ba21589a0362d5e
Chris Manton [Wed, 9 Sep 2020 20:33:16 +0000 (20:33 +0000)]
Re-include stack/btm/btm_sco am:
ab55e6b9ef
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421031
Change-Id: I60183322efec94eb5fc2499fc135bcc7ae007396
Chris Manton [Mon, 7 Sep 2020 19:32:54 +0000 (12:32 -0700)]
Remove unused def BTM_MAX_SCN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0871f88af0ebc6162110cff55aa5ab8923c4874f
Chris Manton [Mon, 7 Sep 2020 19:31:21 +0000 (12:31 -0700)]
Remove unnecessary #def BTM_MAX_SCN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8072f187664e015c8a5bd11040ba1de6b77fff07
Hansong Zhang [Wed, 9 Sep 2020 19:33:30 +0000 (12:33 -0700)]
Remove unused API in l2c_api shim
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieeae2677b6ed300d9878508f18f55a23e54b5f06
Chris Manton [Mon, 7 Sep 2020 17:14:19 +0000 (10:14 -0700)]
Break out stack/btm/btm_sco.h
Towards usable APIs
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9a68209508efcf595a4ad684e3bc7f27f12bfa42
Chris Manton [Mon, 7 Sep 2020 18:33:18 +0000 (11:33 -0700)]
Re-include stack/btm/btm_sco
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5e6f79ef6489dd07a60dcae6afaba0c0b295b689
Chris Manton [Wed, 9 Sep 2020 17:52:47 +0000 (17:52 +0000)]
Move tBTM_INQUIRY_VAR_ST stack/btm:: am:
d9907d09f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421030
Change-Id: I7507c40bf6e7591fd12058c9bef5ea402f195e27
Chris Manton [Wed, 9 Sep 2020 17:52:10 +0000 (17:52 +0000)]
Remove unused #defs BTM_ am:
b2052f3d8a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421029
Change-Id: Ibcb9314b30d1f4e9da777cc99910f422536a1d4a
Chris Manton [Mon, 7 Sep 2020 16:53:56 +0000 (09:53 -0700)]
Move tBTM_INQUIRY_VAR_ST stack/btm::
Structure is not part of security record
From: stack/btm/security_device_record.h
Into: stack/btm/btm_int_types.h
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6a72bcaeb25793a147f6ac131d653c5a96ad02fa
Chris Manton [Mon, 7 Sep 2020 17:06:28 +0000 (10:06 -0700)]
Remove unused #defs BTM_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia1b8b7a471c9ba6ce3784c069df3c9fea2961a99
Martin Brabham [Wed, 9 Sep 2020 00:42:12 +0000 (00:42 +0000)]
Add in metrics calls am:
426886af61
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421700
Change-Id: Ibff7c285f168fe841504348959275c1aa9a3daac
Martin Brabham [Wed, 9 Sep 2020 00:42:07 +0000 (00:42 +0000)]
Rename LruCache -> LegacyLruCache am:
24460cffcf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421699
Change-Id: If16064963c885e3e5b4a53707376b36fe8d708fb
Martin Brabham [Wed, 9 Sep 2020 00:41:19 +0000 (00:41 +0000)]
BTIF DM Shim: Remove obsolete components am:
8db8f6a4ed
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414122
Change-Id: Ic75bef4c9a7e09fd9622a77ca70cc9ff64c59de5
Treehugger Robot [Tue, 8 Sep 2020 23:11:26 +0000 (23:11 +0000)]
Merge "BTM_API Shim: BTA will call shim BTM_API if GD enabled" am:
1211f6a4d1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414121
Change-Id: I919e0692b6fd112b943a1722e72ec0e83e74c05d
Treehugger Robot [Tue, 8 Sep 2020 23:11:17 +0000 (23:11 +0000)]
Merge "Fix l2cap callback connection creation API" am:
45273c4611
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1420529
Change-Id: I954711155b142a67bf3e284bfe20f09c517e32ac
Chris Manton [Tue, 8 Sep 2020 23:11:04 +0000 (23:11 +0000)]
Update stack/::ble_addr_type am:
d98fd04182
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418798
Change-Id: I9ce35a3f044b1645355d061ebf82f1edfed1e303
Chris Manton [Tue, 8 Sep 2020 23:10:25 +0000 (23:10 +0000)]
Update btif/src/::ble_addr_type am:
0aed830450
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418795
Change-Id: I36b1e471c3310bc96b148d526424032e55bcff00
Martin Brabham [Tue, 8 Sep 2020 20:09:21 +0000 (13:09 -0700)]
Add in metrics calls
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I454fd60e8ff669a73407d65e601519b8bf0331e0
Martin Brabham [Tue, 8 Sep 2020 20:02:48 +0000 (13:02 -0700)]
Rename LruCache -> LegacyLruCache
There is a naming conflict with common/lru.h
and gd/common/lru_cache.h. In order to make the
metrics calls from the shim on the actual events
the legacy version has been renamed to reflect.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I4e8656915359fb29b57dcd8405ee295d8ab2a536
Martin Brabham [Thu, 27 Aug 2020 17:23:26 +0000 (10:23 -0700)]
BTIF DM Shim: Remove obsolete components
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: If34f03b35cb6c93f722f71d1646f32f58288934d
Treehugger Robot [Tue, 8 Sep 2020 22:52:43 +0000 (22:52 +0000)]
Merge "BTM_API Shim: BTA will call shim BTM_API if GD enabled"
Treehugger Robot [Tue, 8 Sep 2020 22:51:05 +0000 (22:51 +0000)]
Merge "Fix l2cap callback connection creation API"
Martin Brabham [Thu, 27 Aug 2020 18:08:34 +0000 (11:08 -0700)]
BTM_API Shim: BTA will call shim BTM_API if GD enabled
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I0ab945eec94db65bc17f6e872e6925bd1fd8f1e8
Treehugger Robot [Tue, 8 Sep 2020 20:25:07 +0000 (20:25 +0000)]
Merge "gatt: Fix CID check when receiving ack" am:
3ab2d8b5ac
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1420894
Change-Id: I7fb11d50873ec9283e3d5afe6cfd752bc0636a12
Chris Manton [Wed, 2 Sep 2020 04:58:08 +0000 (21:58 -0700)]
Update stack/::ble_addr_type
Using strict types tBLE_ADDR_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2ebc464cc225fd17fc6c3e43c3c6883b867b7ea9
Chris Manton [Wed, 2 Sep 2020 04:38:44 +0000 (21:38 -0700)]
Update btif/src/::ble_addr_type
Using strict types tBLE_ADDR_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie2e3cda2fe0345f5f901c7037977c2a827bdcf3c
Treehugger Robot [Tue, 8 Sep 2020 19:58:36 +0000 (19:58 +0000)]
Merge "gatt: Fix CID check when receiving ack"