OSDN Git Service
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
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"
Treehugger Robot [Tue, 8 Sep 2020 19:26:46 +0000 (19:26 +0000)]
Merge "Changed HID_DEV_MTU_SIZE from 64 to 512" am:
82156451a3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1420988
Change-Id: I380f94a952fae5ededc604941ecaf7fc2c95f6bc
Treehugger Robot [Tue, 8 Sep 2020 18:29:48 +0000 (18:29 +0000)]
Merge "Changed HID_DEV_MTU_SIZE from 64 to 512"
Treehugger Robot [Tue, 8 Sep 2020 18:16:44 +0000 (18:16 +0000)]
Merge "Shim: Add GD advertising init flags" am:
98543e7520
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1420888
Change-Id: I7777468151abe527e047b0d54b7f06f6dfeb3fca
Chris Manton [Sun, 6 Sep 2020 04:45:45 +0000 (21:45 -0700)]
Fix l2cap callback connection creation API
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5ba3967775f2544846a8524ac1f76177c7510f45
Treehugger Robot [Tue, 8 Sep 2020 18:01:08 +0000 (18:01 +0000)]
Merge "Shim: Add GD advertising init flags"
Treehugger Robot [Tue, 8 Sep 2020 17:41:31 +0000 (17:41 +0000)]
Merge "bt: don't return the address of a stack-allocated string" am:
81c4a7004c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418959
Change-Id: I3961f7a28be5f855715471248eb1887a45dc3759
Treehugger Robot [Tue, 8 Sep 2020 17:14:48 +0000 (17:14 +0000)]
Merge "bt: don't return the address of a stack-allocated string"
Chris Manton [Tue, 8 Sep 2020 16:47:48 +0000 (16:47 +0000)]
Remove l2cap debug logging clutter am:
3c6a4965c1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418794
Change-Id: I4bea781397a680e58dfe1fdc647238c6b8cc068d
Chris Manton [Wed, 2 Sep 2020 22:17:51 +0000 (15:17 -0700)]
Remove l2cap debug logging clutter
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ida4ec6ebdc4cac6ce4778fb154fea1c1c0630d06
Jakub Pawlowski [Tue, 8 Sep 2020 03:56:44 +0000 (03:56 +0000)]
Pass AddressWithType into messages correctly am:
cc99a86ab3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1420989
Change-Id: Iaba6ef9e6b6bc15fccfe5232d4d428b1d7a1bb87
HsingYuan Lo [Tue, 8 Sep 2020 03:27:40 +0000 (11:27 +0800)]
gatt: Fix CID check when receiving ack
Tag: #feature
Test: build & test service change behavior
Bug:
159786353
Change-Id: Idb9811e8dd3b0a7bcacc482501f348c477a918c5
Jakub Pawlowski [Mon, 7 Sep 2020 15:06:28 +0000 (17:06 +0200)]
Pass AddressWithType into messages correctly
BluetoothAddress is created from string, which was improperly set to
both address and type up till now. After this is fixed, one can finally
compare address with expected address in events.
Tag: #gd-refactor
Bug:
155399771
Test: gd/cert/run --host LeSecurityTest
Change-Id: I06d14f9eec6ac457d6f232899a4b9a63879ce7c1
Danny Trunk [Mon, 7 Sep 2020 14:44:24 +0000 (16:44 +0200)]
Changed HID_DEV_MTU_SIZE from 64 to 512
Changed HID_DEV_MTU_SIZE for Amiibo Backups over Bluetooth support
Signed-off-by: Danny Trunk <dtrunk90@gmail.com>
Change-Id: Ie4226b477d040177108729cb25e711fd35bfe0f2
Chienyuan [Mon, 7 Sep 2020 10:03:56 +0000 (18:03 +0800)]
Shim: Add GD advertising init flags
Tag: #gd-refactor
Bug:
159815595
Test: cert/run --host
Change-Id: Ibe9f2b8155b990f3a3ae626339b40aec8d9e116e
George Burgess IV [Sun, 6 Sep 2020 19:49:05 +0000 (12:49 -0700)]
bt: don't return the address of a stack-allocated string
`char foo[] = "bar";` makes a stack-resident `char[4]`. The standard
ways of getting a not-stack-allocated string are:
- `const char *foo = "bar"` (`foo` will point to a `char[4]` in rodata.
casting away the const here leads to badness if the string is
modified.)
- `static char foo[] = "bar"` (`foo` will point to a `char[4]` in a
writeable section of memory that lives for the life of the program.)
Since we return a non-const `char *` here, and since this method is a
stub, the latter seems more appropriate.
Bug:
162984360
Tag: #security
Test: TreeHugger
Change-Id: I51bd4a2d8e2e3826809a1bdc9743d2d1cb62870f
Chris Manton [Sun, 6 Sep 2020 07:19:21 +0000 (07:19 +0000)]
Use tBTM_CB::tBTM_BLE_CB::scan_activity am:
d7ad610a98
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418801
Change-Id: I97fcc3404d53566987570b108b42fd29a23c9072
Chris Manton [Thu, 3 Sep 2020 00:35:56 +0000 (17:35 -0700)]
Use tBTM_CB::tBTM_BLE_CB::scan_activity
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib1635458ff785125b5718622e719b11979744e71
Chris Manton [Sun, 6 Sep 2020 01:36:30 +0000 (01:36 +0000)]
encapsulate tBTM_CB::tBTM_BLE_CB::scan_activity am:
56c6f06d04
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418800
Change-Id: I40d9ff10a8baf543ebf1a84b233e70888c090b1b
Chris Manton [Thu, 3 Sep 2020 00:25:21 +0000 (17:25 -0700)]
encapsulate tBTM_CB::tBTM_BLE_CB::scan_activity
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I66624e8d0c900b23b1b9e36b655b67c9c8a52155
Chris Manton [Sat, 5 Sep 2020 21:04:36 +0000 (21:04 +0000)]
Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry am:
f5d87ab7cf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418799
Change-Id: Ida846b78b66126bbe2c34abe56ab15f62065f795
Chris Manton [Thu, 3 Sep 2020 00:56:56 +0000 (17:56 -0700)]
Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry
First param is a constant from only call junction
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I78b8b602a8d1d207e52903e8e5ba307cabd9119e
Chris Manton [Sat, 5 Sep 2020 01:19:28 +0000 (01:19 +0000)]
Update bta/include/::ble_addr_type am:
1048cf14e6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418797
Change-Id: Ieda52d2c9b10ce95b2dbeea1237d7e6b0a437bda
Chris Manton [Wed, 2 Sep 2020 04:47:35 +0000 (21:47 -0700)]
Update bta/include/::ble_addr_type
Using strict types tBLE_ADDR_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1177d0a1f3054af4ef739d38703ca53a8b5fbf52
Chris Manton [Fri, 4 Sep 2020 18:24:14 +0000 (18:24 +0000)]
Update main/shim/::ble_addr_type am:
0f6f6e0b10
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418796
Change-Id: I34f0286bb8390e23d44955e16822ce0f6f6e202e
Chris Manton [Wed, 2 Sep 2020 04:45:37 +0000 (21:45 -0700)]
Update main/shim/::ble_addr_type
Using strict types tBLE_ADDR_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieb3b5a50f12317b926a96d6886f431686ef2d37d
Jakub Pawlowski [Fri, 4 Sep 2020 09:04:13 +0000 (09:04 +0000)]
Merge "gatt: Add CID for sending notification confirmation" am:
b20766d1a8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1419293
Change-Id: I44fc83f75a337ce8dfafd60df2497fbb025baac9
Jakub Pawlowski [Fri, 4 Sep 2020 09:03:19 +0000 (09:03 +0000)]
Merge changes from topic "bt-char-ext-prop" am:
d5421f74f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/710986
Change-Id: Ia66f3381ee94b45b29c7b84bd0e1f5b1e43738c2
Jakub Pawlowski [Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)]
Merge "gatt: Add CID for sending notification confirmation"
Jakub Pawlowski [Fri, 4 Sep 2020 08:38:35 +0000 (08:38 +0000)]
Merge changes from topic "bt-char-ext-prop"
* changes:
Fall back to Read Request when reading Characteristic Extended Properties
Server support for Characteristic Extended Properties
Client support for Characteristic Extended Properties
Treehugger Robot [Fri, 4 Sep 2020 04:57:08 +0000 (04:57 +0000)]
Merge "Shim: Security module InitFlag" am:
4eb05b6173
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416248
Change-Id: I2a61c23205bf989995987e33ea9dff82af341760
Treehugger Robot [Fri, 4 Sep 2020 04:27:39 +0000 (04:27 +0000)]
Merge "Shim: Security module InitFlag"
Hansong Zhang [Thu, 3 Sep 2020 22:44:22 +0000 (22:44 +0000)]
Shim layer for GD security enforcement am:
1211b69210
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1419609
Change-Id: I233d5d430c676f1b2c13c53df0b874208598bb78
Hansong Zhang [Thu, 3 Sep 2020 20:57:08 +0000 (20:57 +0000)]
Use BTM_GetHCIConnHandle to get handle am:
51cdd36e54
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418793
Change-Id: Id38c0859a6988c23e911ad10991e97967bbb0ee9
Łukasz Rymanowski [Thu, 3 Sep 2020 14:04:19 +0000 (14:04 +0000)]
gatt: Add CID for sending notification confirmation
This patch fixes a regression after
commit
7a496c86ba675e1023a5b84de686a823834896db
stack/gatt: Extend calls with CID
Notification confirmation was not taken into account.
For notification function attp_send_cl_msg() is called with p_clcb NULL
which leads to a crash in the following line:
uint16_t payload_size = gatt_tcb_get_payload_size_tx(tcb, p_clcb->cid);
This patch introduces a new function: attp_send_cl_confirmation_msg()
which is used only for sending confirmation.
Also this patch makes sure that cid is provided to the GATT client so it
can be used in the confirmation call.
Note: handle was removed from the confirmation call as it is redundant.
The only missing part in this patch is handling timers per each
indication and this will be fixed in following patches which will add
eatt support.
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: I8bdb38ec673e11744d670223e5416be01666e1a6
OSDN Git Service
