OSDN Git Service
Abhishek Pandit-Subedi [Fri, 23 Apr 2021 21:47:56 +0000 (21:47 +0000)]
Merge "Additional changes for Linux build" am:
ed68c8e76b am:
6a2f8832c9 am:
a845de6565
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1673591
Change-Id: I25229e2d1ffae31c41950a461154a93caac34b59
Abhishek Pandit-Subedi [Fri, 23 Apr 2021 21:13:17 +0000 (21:13 +0000)]
Merge "Additional changes for Linux build" am:
ed68c8e76b am:
6a2f8832c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1673591
Change-Id: I2fa9397d380c0793efdfa06641fd767c7e7998ea
Abhishek Pandit-Subedi [Fri, 23 Apr 2021 20:52:52 +0000 (20:52 +0000)]
Merge "Additional changes for Linux build" am:
ed68c8e76b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1673591
Change-Id: I6e4d975992b838e8143f68029a7e72b65b6b5754
Sonny Sasaka [Fri, 23 Apr 2021 20:42:16 +0000 (20:42 +0000)]
Merge "Add scripts to generate Debian packages of Fluoride dependencies" am:
44f7e2c744 am:
ddd071cb2f am:
27d9fa7465
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668865
Change-Id: I67588d58025101fd2d1d63c895037690942eb5d2
Abhishek Pandit-Subedi [Fri, 23 Apr 2021 20:21:39 +0000 (20:21 +0000)]
Merge "Additional changes for Linux build"
Sonny Sasaka [Fri, 23 Apr 2021 20:20:00 +0000 (20:20 +0000)]
Merge "Add scripts to generate Debian packages of Fluoride dependencies" am:
44f7e2c744 am:
ddd071cb2f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668865
Change-Id: Ic42d346a47c4b8aa73e74e802f0db5bfe8ff47f1
Sonny Sasaka [Fri, 23 Apr 2021 20:00:35 +0000 (20:00 +0000)]
Merge "Add scripts to generate Debian packages of Fluoride dependencies" am:
44f7e2c744
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668865
Change-Id: I459cef2c76fe1f5bc31dc7649606e364b8d4e9e8
Jeff Sharkey [Fri, 23 Apr 2021 19:38:55 +0000 (19:38 +0000)]
Merge "Add AttributionSource to BT methods." into sc-dev
Sonny Sasaka [Fri, 23 Apr 2021 19:36:01 +0000 (19:36 +0000)]
Merge "Add scripts to generate Debian packages of Fluoride dependencies"
Abhishek Pandit-Subedi [Sat, 10 Apr 2021 00:41:07 +0000 (00:41 +0000)]
Additional changes for Linux build
While building for Linux on cloudtop, a few more problems were
identified in the build. There were a couple of missing #include and
some incomplete struct definitions in btm_int_types.h. Also put
statslog.h behind an #ifdef OS_ANDROID.
Bug:
184975659
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: Ic2272a3acfa66259e692db280b48b4ddadff2171
Myles Watson [Fri, 23 Apr 2021 18:26:21 +0000 (18:26 +0000)]
Merge "gd test: Enqueue data/command in right order" am:
72244b6ba2 am:
b6d8c419e1 am:
06901a6c00
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685028
Change-Id: I8beb9d8a0ad35f86900036c7fb965ca99beee693
Myles Watson [Fri, 23 Apr 2021 18:26:07 +0000 (18:26 +0000)]
Merge "gd acl: Only ack pause when onPause" am:
b413b3bdb5 am:
e48cc154c9 am:
a0d666b617
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685027
Change-Id: If26d9cdbe79481d60f5c0ef9670387ad7b048f0d
Jack He [Fri, 23 Apr 2021 18:25:48 +0000 (18:25 +0000)]
GD-Shim: Free BT_HDR after use or callback failure am:
8c6d960f52 am:
eded1fba7c am:
3256bb37d2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685485
Change-Id: Ida88e8a58838505cfd4935ded5f8e9786fa5cab3
Myles Watson [Fri, 23 Apr 2021 18:05:13 +0000 (18:05 +0000)]
Merge "gd test: Enqueue data/command in right order" am:
72244b6ba2 am:
b6d8c419e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685028
Change-Id: I81acaa123958767e9c24fb3608e32aaec4f775bf
Myles Watson [Fri, 23 Apr 2021 18:04:53 +0000 (18:04 +0000)]
Merge "gd acl: Only ack pause when onPause" am:
b413b3bdb5 am:
e48cc154c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685027
Change-Id: Ic7227ac9b79f73d78277d66e7792a6b6f3f2fd6b
Jack He [Fri, 23 Apr 2021 18:04:37 +0000 (18:04 +0000)]
GD-Shim: Free BT_HDR after use or callback failure am:
8c6d960f52 am:
eded1fba7c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685485
Change-Id: Iae2bbf52a5dc95e555588a884767a3a1ef753fd2
Myles Watson [Fri, 23 Apr 2021 17:46:53 +0000 (17:46 +0000)]
Merge "gd test: Enqueue data/command in right order" am:
72244b6ba2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685028
Change-Id: I79aabdf7c2b920d1be562c2ad55f5012eb21fd5f
Myles Watson [Fri, 23 Apr 2021 17:46:05 +0000 (17:46 +0000)]
Merge "gd acl: Only ack pause when onPause" am:
b413b3bdb5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685027
Change-Id: Ia4e8eec3be6af8f2945affa649c76a9f56a9b5c0
Jack He [Fri, 23 Apr 2021 17:44:23 +0000 (17:44 +0000)]
GD-Shim: Free BT_HDR after use or callback failure am:
8c6d960f52
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1685485
Change-Id: Ia5c494b010d3bcab66715fabbf354ceaa4f28105
Myles Watson [Fri, 23 Apr 2021 17:34:55 +0000 (17:34 +0000)]
Merge "gd test: Enqueue data/command in right order"
Myles Watson [Fri, 23 Apr 2021 17:33:35 +0000 (17:33 +0000)]
Merge "gd acl: Only ack pause when onPause"
Chienyuan [Fri, 23 Apr 2021 10:12:44 +0000 (18:12 +0800)]
gd test: Enqueue data/command in right order
Tag: #gd-refactor
Bug:
186071486
Test: gd/cert/run
Test: bluetooth_test_gd
Change-Id: Iec8663e8ae99fb689871e982b85c81a4f093b555
Chienyuan [Fri, 23 Apr 2021 07:26:03 +0000 (15:26 +0800)]
gd acl: Only ack pause when onPause
Tag: #gd-refactor
Bug:
186071486
Test: gd/cert/run
Change-Id: I5557312ec21485dea3513977bc893de3d58a50fa
Jack He [Fri, 23 Apr 2021 07:20:38 +0000 (00:20 -0700)]
GD-Shim: Free BT_HDR after use or callback failure
* Legacy stack always assume the last user of BT_HDR
will free the structure. Make sure we do this in GD
shim as well
Bug:
185083624
Tag: #gd-refactor
Test: gd/cert/run
Send a 31MB video
- before this change, RSS increased by 86 MB when 10% (3MB) was sent
- after this change, RSS increased by 37 MB and stabilized, this
increase is anticipated as the file needs to be cached in RAM
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: Ie934e6d4edd7dfc79b4444ce1c13819834f59692
Oli Lan [Thu, 22 Apr 2021 18:11:03 +0000 (19:11 +0100)]
Add AttributionSource to BT methods.
This adds attribution source as a parameter to Bluetooth methods
This is now required to allow the app ops for the new
bluetooth permissions (BLUETOOTH_CONNECT, BLUETOOTH_ADVERTISE,
and BLUETOOTH_SCAN) to be noted.
Bug:
183626112
Test: atest BluetoothInstrumentationTests
Change-Id: I8c10fe46d43f4ca1cd4f902f1cf53ede72b689d1
Chen Chen [Thu, 22 Apr 2021 19:30:57 +0000 (19:30 +0000)]
Merge "GD metrics: Log remote version info and manufacturer info at connection complete" am:
03ad3c4dfa am:
ae9d44f13b am:
ef8b5e374b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682885
Change-Id: I301f3ad974c6bf7f4c8e088c375286f4656f010b
Treehugger Robot [Thu, 22 Apr 2021 19:30:47 +0000 (19:30 +0000)]
Merge changes Ib883ada4,Ie9d9fb20 am:
187177a86b am:
3bd318fdbe am:
4663bd4172
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1684369
Change-Id: If54ef2a535d4e9c42ec681e1bd3a7a76a6a365c0
Treehugger Robot [Thu, 22 Apr 2021 19:29:59 +0000 (19:29 +0000)]
Merge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect" am:
98daa4e13e am:
5a3fc715fc am:
930a65fc5c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683245
Change-Id: Ibcf02466c13f0c9a78a044ff3c7e03b27666cd8a
Chen Chen [Thu, 22 Apr 2021 19:09:37 +0000 (19:09 +0000)]
Merge "GD metrics: Log remote version info and manufacturer info at connection complete" am:
03ad3c4dfa am:
ae9d44f13b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682885
Change-Id: I4e2c215a0eb59840d7fb18c37b02b36633ce2d44
Treehugger Robot [Thu, 22 Apr 2021 19:09:18 +0000 (19:09 +0000)]
Merge changes Ib883ada4,Ie9d9fb20 am:
187177a86b am:
3bd318fdbe
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1684369
Change-Id: I385ddf7ab37808cfeb70f1254fd8662b920f9fc7
Treehugger Robot [Thu, 22 Apr 2021 19:08:07 +0000 (19:08 +0000)]
Merge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect" am:
98daa4e13e am:
5a3fc715fc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683245
Change-Id: I1fd33a1268141693d8f0253c0fd187eb9d6643e8
Chen Chen [Thu, 22 Apr 2021 19:07:02 +0000 (19:07 +0000)]
Merge "GD metrics: Log remote version info and manufacturer info at connection complete" am:
03ad3c4dfa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682885
Change-Id: Iac8cb1a60be22c1cea8308a6b1dc30da9c8dd61b
Treehugger Robot [Thu, 22 Apr 2021 19:05:17 +0000 (19:05 +0000)]
Merge changes Ib883ada4,Ie9d9fb20 am:
187177a86b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1684369
Change-Id: Ic63a9087e82c0980b0bfd2e0a5f175d5f5ddc67e
Treehugger Robot [Thu, 22 Apr 2021 18:51:51 +0000 (18:51 +0000)]
Merge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect" am:
98daa4e13e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683245
Change-Id: Ie23e3c7ec5ffda70d484b2f7206f5e476d79d489
Chen Chen [Thu, 22 Apr 2021 17:55:56 +0000 (17:55 +0000)]
Merge "GD metrics: Log remote version info and manufacturer info at connection complete"
Treehugger Robot [Thu, 22 Apr 2021 17:39:34 +0000 (17:39 +0000)]
Merge changes Ib883ada4,Ie9d9fb20
* changes:
GD: Add verbose logging to module start-up code
GD Controller: Do not register events that are already registered in HCI
Jack He [Thu, 22 Apr 2021 05:32:57 +0000 (22:32 -0700)]
GD: Add verbose logging to module start-up code
Bug:
184608842
Test: make, start bluetooth
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ib883ada4cd64d2adb37fdb00312ab581d7a4d50a
Treehugger Robot [Thu, 22 Apr 2021 17:36:35 +0000 (17:36 +0000)]
Merge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect"
Chris Manton [Thu, 22 Apr 2021 07:23:34 +0000 (07:23 +0000)]
dumpsys: Properly log classic/le ACL am:
1684e06a2d am:
d30b5095de am:
0f28a72b59
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642949
Change-Id: Icc298aceff3de234d65ac20386eaa2e424669d77
Chris Manton [Thu, 22 Apr 2021 07:11:29 +0000 (07:11 +0000)]
dumpsys: Properly log classic/le ACL am:
1684e06a2d am:
d30b5095de
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642949
Change-Id: If3be6eee168b355d348c2d519727e3e33f3e8741
Chris Manton [Thu, 22 Apr 2021 06:45:08 +0000 (06:45 +0000)]
dumpsys: Properly log classic/le ACL am:
1684e06a2d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642949
Change-Id: Ida619b6fc34fbc83d8bf3e9e253a7b1f97197c1f
Jack He [Thu, 22 Apr 2021 04:49:13 +0000 (21:49 -0700)]
GD Controller: Do not register events that are already registered in HCI
Bug:
186069471
Test: make, enable BT, pair headset, listen to music, make calls
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ie9d9fb20f0b442ed5c84edd5ef03e46be2370504
Treehugger Robot [Thu, 22 Apr 2021 05:13:23 +0000 (05:13 +0000)]
Merge changes I32c92511,I1a3d841d,Ibc688eac am:
7085f57ead am:
292660eace am:
9e26e18f89
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683356
Change-Id: I68d0497aa86e7b6d28c15347db621e668339d643
Treehugger Robot [Thu, 22 Apr 2021 04:51:52 +0000 (04:51 +0000)]
Merge changes I32c92511,I1a3d841d,Ibc688eac am:
7085f57ead am:
292660eace
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683356
Change-Id: Ie4e183736914254d9e0f1cdd41209bc331b76779
Chris Manton [Thu, 22 Apr 2021 04:43:29 +0000 (04:43 +0000)]
Polish tBTM_SEC_DEV_REC::ToString am:
a11ca353f6 am:
3c8fdc81ba am:
0e85dec581
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642948
Change-Id: I09dccb5d43d9405477369419211160879b0b0c6c
Chris Manton [Sun, 14 Mar 2021 16:51:53 +0000 (09:51 -0700)]
dumpsys: Properly log classic/le ACL
Toward loggable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I2abfb24cdcd174dc026d75f8d37d53abfa983266
Treehugger Robot [Thu, 22 Apr 2021 04:30:12 +0000 (04:30 +0000)]
Merge changes I32c92511,I1a3d841d,Ibc688eac am:
7085f57ead
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683356
Change-Id: I58189b331ff7fa2c3b2cc48c791dee5287e49092
Chris Manton [Thu, 22 Apr 2021 04:15:13 +0000 (04:15 +0000)]
Polish tBTM_SEC_DEV_REC::ToString am:
a11ca353f6 am:
3c8fdc81ba
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642948
Change-Id: I9a5e9ec41bd6f75967453831b6ddd75ff9f75b87
Treehugger Robot [Thu, 22 Apr 2021 04:12:44 +0000 (04:12 +0000)]
Merge changes I32c92511,I1a3d841d,Ibc688eac
* changes:
legacy: Add HACK to set legacy SM4 from gd_acl
gd: Re-introduce read remote supported features
BTM_history: Add dev states to stack hid host profile
Chris Manton [Thu, 22 Apr 2021 03:55:15 +0000 (03:55 +0000)]
Polish tBTM_SEC_DEV_REC::ToString am:
a11ca353f6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642948
Change-Id: Ie35d5e06db97edcd45d0053c8229632fc4014840
Chris Manton [Thu, 22 Apr 2021 03:14:19 +0000 (03:14 +0000)]
Store remote lmp version in security record am:
d1c0313cfd am:
5bf8dbda1c am:
1cdacd713a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642943
Change-Id: Ie100a2e9b4f85379797e8b26543a9be318ca6f97
Chris Manton [Thu, 22 Apr 2021 02:48:28 +0000 (02:48 +0000)]
Store remote lmp version in security record am:
d1c0313cfd am:
5bf8dbda1c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642943
Change-Id: I6f87a6218656a7b8925fc7415429f956f63f183d
Chris Manton [Thu, 22 Apr 2021 02:26:16 +0000 (02:26 +0000)]
Store remote lmp version in security record am:
d1c0313cfd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642943
Change-Id: Ice0a44f1e8e7db11c40c496cf7b9dff586793534
Chris Manton [Sun, 14 Mar 2021 16:51:37 +0000 (09:51 -0700)]
Polish tBTM_SEC_DEV_REC::ToString
Toward loggable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I1e6e7a2ed45fd61da9b6020b3d09f1135e7c59d3
Chris Manton [Thu, 22 Apr 2021 01:14:35 +0000 (18:14 -0700)]
legacy: Add HACK to set legacy SM4 from gd_acl
Bug:
185967523
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I32c92511fadebf458175a7f8f210c4ec0e0d3c74
Chris Manton [Thu, 22 Apr 2021 00:36:09 +0000 (17:36 -0700)]
gd: Re-introduce read remote supported features
This command is very similar to the remote extended
features for page 0 and can cause confusion. Broke out
into its own code path for clarity
Bug:
185967523
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I1a3d841d811b47c928521ac3422c13c0c69ea975
Chris Manton [Sat, 17 Apr 2021 18:02:47 +0000 (11:02 -0700)]
BTM_history: Add dev states to stack hid host profile
Toward loggable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ibc688eacf75a8520fdd74dfef41b2794668bbfa4
Chris Manton [Thu, 22 Apr 2021 00:31:01 +0000 (00:31 +0000)]
Re-log btif_update_remote_version_property am:
923da51695 am:
8d37805ba8 am:
8e4b6f598d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642942
Change-Id: Ic75892b5a28bd806b07d6f2d08f850a620f6ae23
Chris Manton [Thu, 22 Apr 2021 00:07:03 +0000 (00:07 +0000)]
Re-log btif_update_remote_version_property am:
923da51695 am:
8d37805ba8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642942
Change-Id: Ibf26c88f57c2e43a18bbe7b0ba822b5441d721c5
Chris Manton [Wed, 21 Apr 2021 23:47:55 +0000 (23:47 +0000)]
Re-log btif_update_remote_version_property am:
923da51695
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642942
Change-Id: I7ea26e83875e48009a8bf2270f9cff58f54dd85b
Chris Manton [Fri, 12 Mar 2021 06:30:46 +0000 (22:30 -0800)]
Store remote lmp version in security record
Toward loggable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I928bcb52c65b5c9a3cbfd67d48a3465b7e14959f
Jeff Sharkey [Wed, 21 Apr 2021 22:40:21 +0000 (22:40 +0000)]
Merge "Add AttributionSource to IBluetooth methods." into sc-dev
Chris Manton [Fri, 12 Mar 2021 01:57:21 +0000 (17:57 -0800)]
Re-log btif_update_remote_version_property
Toward readable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I1fab5db45be15edaae5a6a68f5661347fe80cf02
Chris Manton [Wed, 21 Apr 2021 20:54:19 +0000 (20:54 +0000)]
Remove mutable param input bta/hh/bta_hh_act am:
89cb12486d am:
bd3285e810 am:
9549cff5b6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642921
Change-Id: Ic4c8e1e31892204a45b041cdadfa40ccf8725b4c
Chen Chen [Wed, 21 Apr 2021 00:24:32 +0000 (17:24 -0700)]
GD metrics: Log remote version info and manufacturer info at connection complete
Test: gd/cert/run
Manual test: build and run Bluetooth (connection, pairing, music and phone call)
Bug:
181819141
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I4febd598ea786ffdaeef100e04edd35a72db4b6c
Chris Manton [Wed, 21 Apr 2021 20:31:43 +0000 (20:31 +0000)]
Remove mutable param input bta/hh/bta_hh_act am:
89cb12486d am:
bd3285e810
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642921
Change-Id: I2b630e0d26c20188bbd5c4030b892453984e4932
Chris Manton [Wed, 21 Apr 2021 20:08:26 +0000 (20:08 +0000)]
Remove mutable param input bta/hh/bta_hh_act am:
89cb12486d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642921
Change-Id: I0bb2448a6ab04f278d9a664cac30876bab0afbc4
Treehugger Robot [Wed, 21 Apr 2021 19:30:10 +0000 (19:30 +0000)]
Merge changes Iac4351a2,Ib8fadd80 am:
1b14f2df06 am:
66188bce23 am:
8f8e25c681
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642919
Change-Id: I36d79fe0966625db26c13a2d2f0c41ecc11d132b
Treehugger Robot [Wed, 21 Apr 2021 19:00:55 +0000 (19:00 +0000)]
Merge changes Iac4351a2,Ib8fadd80 am:
1b14f2df06 am:
66188bce23
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642919
Change-Id: I2c72521c2d7940f3fa8497a2c0af511de114da5f
Treehugger Robot [Wed, 21 Apr 2021 18:35:04 +0000 (18:35 +0000)]
Merge changes Iac4351a2,Ib8fadd80 am:
1b14f2df06
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642919
Change-Id: Ia8b490c6aa460ca431e0b65052f9f7c35e8ba211
Chris Manton [Wed, 17 Mar 2021 03:05:03 +0000 (20:05 -0700)]
Remove mutable param input bta/hh/bta_hh_act
Please do not modify the parameters
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I63a2d921aef40f897058a4a826f9732d6f3d72ae
Treehugger Robot [Wed, 21 Apr 2021 18:01:04 +0000 (18:01 +0000)]
Merge changes Iac4351a2,Ib8fadd80
* changes:
Demote log message to informational LeAddressManagerCallback
shim: Add sync at completion connection test
Chienyuan [Wed, 21 Apr 2021 17:53:51 +0000 (17:53 +0000)]
gd hci: Check extended feature supported when read remote feature complete am:
cbadf293bd am:
14e39c0f6e am:
3cfade0667
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683246
Change-Id: I74c2bcebfa8a6d2edb22320cc9661e31e584469c
Chienyuan [Wed, 21 Apr 2021 17:28:51 +0000 (17:28 +0000)]
gd hci: Check extended feature supported when read remote feature complete am:
cbadf293bd am:
14e39c0f6e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683246
Change-Id: I1029bf23dea74b34c67b8010b34524aa3c43254c
Chienyuan [Wed, 21 Apr 2021 17:01:55 +0000 (17:01 +0000)]
gd hci: Check extended feature supported when read remote feature complete am:
cbadf293bd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683246
Change-Id: I6e6cc54019f415056dbfff947d6bb6ce64187c33
Oli Lan [Tue, 20 Apr 2021 08:57:28 +0000 (09:57 +0100)]
Add AttributionSource to IBluetooth methods.
This adds attribution source as a parameter to most of the IBluetooth
methods. This is now required to allow the app ops for the new
bluetooth permissions (BLUETOOTH_CONNECT, BLUETOOTH_ADVERTISE,
and BLUETOOTH_SCAN) to be noted.
Bug:
183626112
Test: atest AdapterServiceTest
Test: atest CtsPermissionTestCases:android.permission.cts.NearbyDevicesPermissionTest
Change-Id: I72eecfcf6a3df6788b850251a9ebf066c79466bc
Chris Manton [Fri, 12 Mar 2021 01:56:57 +0000 (17:56 -0800)]
Demote log message to informational LeAddressManagerCallback
It is normal for multiple handlers to invoke upon receipt
of this event.
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Iac4351a21883bf991c43885ae4bab473681ad1cc
Chris Manton [Mon, 19 Apr 2021 15:29:39 +0000 (08:29 -0700)]
shim: Add sync at completion connection test
Bug:
181991662
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ib8fadd805da65d24be6dc590ecdb0f4978341ffc
Treehugger Robot [Wed, 21 Apr 2021 14:31:12 +0000 (14:31 +0000)]
Merge "gd Scanning: Ignore non-anonymous advertising report with empty address" am:
ce2a6aa66b am:
93c8c27889 am:
82bb05034c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1681085
Change-Id: I3288bb2431cffff30f736e260080c878ee26b586
Treehugger Robot [Wed, 21 Apr 2021 14:07:14 +0000 (14:07 +0000)]
Merge "gd Scanning: Ignore non-anonymous advertising report with empty address" am:
ce2a6aa66b am:
93c8c27889
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1681085
Change-Id: I2b093102304589de1a00feea24af726d864d5e14
Treehugger Robot [Wed, 21 Apr 2021 13:43:58 +0000 (13:43 +0000)]
Merge "gd Scanning: Ignore non-anonymous advertising report with empty address" am:
ce2a6aa66b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1681085
Change-Id: If213df1d8634443abf538e385a10347840681062
Chienyuan [Wed, 21 Apr 2021 13:37:19 +0000 (21:37 +0800)]
gd hci: Check extended feature supported when read remote feature complete
Tag: #gd-refactor
Bug:
185972929
Test: gd/cert/run
Change-Id: Id8bbb197694e2e68211968c46fe556062a60f31c
Treehugger Robot [Wed, 21 Apr 2021 13:27:21 +0000 (13:27 +0000)]
Merge "gd Scanning: Ignore non-anonymous advertising report with empty address"
Chienyuan [Tue, 20 Apr 2021 11:50:53 +0000 (19:50 +0800)]
gd Scanning: Ignore non-anonymous advertising report with empty address
Tag: #gd-refactor
Bug:
185793671
Test: gd/cert/run
Change-Id: I56d671aa2726db64ae6e34bc8b32bc5461ae3609
weichinweng [Wed, 21 Apr 2021 07:42:27 +0000 (15:42 +0800)]
HIDH: Initialize the ctrl_cid after trigger l2cap disconnect
Since the ctrl_cid doesn't initialize, the HIDH sm can't initialize.
Next time, can't correctly trigger connect and handle the ctrl_cid
connect request.
Bug:
184128916
Test: compile && disconnect/reconnect HID device
Tag: #feature
Change-Id: I7bafe8728726d3df1d0bc58c8bc5224260042365
Chris Manton [Wed, 21 Apr 2021 07:29:34 +0000 (07:29 +0000)]
Align bt_transport_text syntactically with legacy am:
a8b544ac48 am:
32bef90b2b am:
c639d55641
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642920
Change-Id: I99225f28f75fdcb0d5eb736dc49c486715d55c92
Chris Manton [Wed, 21 Apr 2021 07:29:28 +0000 (07:29 +0000)]
Enum-ify stack/l2cap/l2c_int::tL2CEVT am:
54d3ad42ba am:
7a3a77d859 am:
f3dd9c5475
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642918
Change-Id: I4e7038afcf3291baf83a8042ed9a7c9a1d56f109
Chris Manton [Wed, 21 Apr 2021 07:06:02 +0000 (07:06 +0000)]
Align bt_transport_text syntactically with legacy am:
a8b544ac48 am:
32bef90b2b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642920
Change-Id: I98b6c99d825104f39606fae37c6a23aa8aa32681
Chris Manton [Wed, 21 Apr 2021 07:05:58 +0000 (07:05 +0000)]
Enum-ify stack/l2cap/l2c_int::tL2CEVT am:
54d3ad42ba am:
7a3a77d859
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642918
Change-Id: Iacff8275fc2473e6f9c77232b2efe6ccd549b78f
Chris Manton [Wed, 21 Apr 2021 06:44:26 +0000 (06:44 +0000)]
Align bt_transport_text syntactically with legacy am:
a8b544ac48
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642920
Change-Id: I9e8f18c3a7aa4ed24027c45b71068579ce059c28
Chris Manton [Wed, 21 Apr 2021 06:43:36 +0000 (06:43 +0000)]
Enum-ify stack/l2cap/l2c_int::tL2CEVT am:
54d3ad42ba
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1642918
Change-Id: I23233559c42050dc72cd50baa54977b40b1fed7c
Chris Manton [Sun, 14 Mar 2021 16:50:25 +0000 (09:50 -0700)]
Align bt_transport_text syntactically with legacy
Also disambiguate from identical call
service/logging_helpers.h
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I75f25dcffb799879ab8f53e3cecba8bc573b5c16
Chris Manton [Wed, 21 Apr 2021 04:35:37 +0000 (04:35 +0000)]
legacy: Re-log btif/src/btif_hh::bte_hh_evt am:
32d5babf6e am:
4890f295fa am:
366e78619a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1678933
Change-Id: I21d11caca9bb8cc8b34dbd41eb72542b494f22c3
Chris Manton [Tue, 16 Mar 2021 02:40:25 +0000 (19:40 -0700)]
Enum-ify stack/l2cap/l2c_int::tL2CEVT
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I5b890c27aa183b183800806e012383d66ee27fd0
Chris Manton [Wed, 21 Apr 2021 04:06:29 +0000 (04:06 +0000)]
legacy: Re-log btif/src/btif_hh::bte_hh_evt am:
32d5babf6e am:
4890f295fa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1678933
Change-Id: I4fcc47c7cf57b23d03efdd44a06dd8538f7e25a5
Chris Manton [Wed, 21 Apr 2021 03:41:38 +0000 (03:41 +0000)]
legacy: Re-log btif/src/btif_hh::bte_hh_evt am:
32d5babf6e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1678933
Change-Id: Icd7d6e40536b0c56ac4791925a33813294528375
Chris Manton [Wed, 21 Apr 2021 02:54:01 +0000 (02:54 +0000)]
Replace BT_HDR => BT_HDR_RIGID am:
bcaa36df77 am:
b77dac132b am:
7d7e19de0d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1629211
Change-Id: I9458409fc7db0f97940c6138d8c5de19a743ec80
Zach Johnson [Wed, 21 Apr 2021 02:54:00 +0000 (02:54 +0000)]
Remove unused flags am:
43838d7693 am:
a36f2d9c48 am:
f859a47706
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1406245
Change-Id: I859eae1c96720e698d92b772032fb7b7db753f60
Chris Manton [Wed, 21 Apr 2021 02:23:44 +0000 (02:23 +0000)]
Replace BT_HDR => BT_HDR_RIGID am:
bcaa36df77 am:
b77dac132b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1629211
Change-Id: I48e2dad1b8371012ccb1d55d7d2683ca6751cfa3
Zach Johnson [Wed, 21 Apr 2021 02:23:42 +0000 (02:23 +0000)]
Remove unused flags am:
43838d7693 am:
a36f2d9c48
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1406245
Change-Id: I57e004aaa0606d4668433702b75a069165580cf3
OSDN Git Service
