OSDN Git Service
TreeHugger Robot [Wed, 8 Dec 2021 22:59:57 +0000 (22:59 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into sc-qpr1-dev am:
f648ee5c77 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
86770f2828 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184350
Change-Id: I993b16e705aacc8654edf7a38203668e60d07f8d
TreeHugger Robot [Wed, 8 Dec 2021 21:55:29 +0000 (21:55 +0000)]
Merge "Reset the IRK after all devices are unpaired" into sc-qpr1-dev
Chris Manton [Wed, 8 Dec 2021 03:27:13 +0000 (03:27 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
0ae4f050db am:
8396d3e4b3 am:
6af8dde13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I8f1082e3168dc73c6d4673303845f5526fad4b54
TreeHugger Robot [Wed, 8 Dec 2021 03:27:05 +0000 (03:27 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
ff9715fa67 am:
cd24dabfa4 am:
9c82404f4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I6d4d96053d4a0817bde19831f7d0be785c6f0744
TreeHugger Robot [Wed, 8 Dec 2021 03:26:57 +0000 (03:26 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev am:
b4a92cca94 am:
5343ac9e96 am:
ab7d792689
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207306
Change-Id: Iba32fb3814430fcff23a0b0b1891fed9238c2e69
Chris Manton [Wed, 8 Dec 2021 03:26:49 +0000 (03:26 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
884bfe1918 -s ours am:
df3c352804 -s ours am:
a3f4ccc67b -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I42cf22009ce22b1b91c806bd1479fa04781d776a
Chris Manton [Wed, 8 Dec 2021 03:03:25 +0000 (03:03 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
0ae4f050db am:
8396d3e4b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I23771e66023a80828478dbefda3135fc935fd4e4
TreeHugger Robot [Wed, 8 Dec 2021 03:03:16 +0000 (03:03 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
ff9715fa67 am:
cd24dabfa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: If603e94ba5c9441c0cea179346b26c21951d1b19
TreeHugger Robot [Wed, 8 Dec 2021 03:03:09 +0000 (03:03 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev am:
b4a92cca94 am:
5343ac9e96
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207306
Change-Id: I167478748df044bf633b818d1f80576250f51039
Chris Manton [Wed, 8 Dec 2021 03:03:02 +0000 (03:03 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
884bfe1918 -s ours am:
df3c352804 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I7a2b7540c955b3c1d73b87f79fe66a5af96d9c3a
Chris Manton [Wed, 8 Dec 2021 02:45:05 +0000 (02:45 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
0ae4f050db
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I8129d0e49e8d4ce590cf1962e9fdd43e6ce3cf9e
TreeHugger Robot [Wed, 8 Dec 2021 02:44:57 +0000 (02:44 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
ff9715fa67
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: Ica8934a455aab466ca981ae949af6cccb340dcc5
TreeHugger Robot [Wed, 8 Dec 2021 02:44:48 +0000 (02:44 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev am:
b4a92cca94
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207306
Change-Id: I16ffb06771a37512694d14bef5cbdcde56d8902e
Chris Manton [Wed, 8 Dec 2021 02:44:38 +0000 (02:44 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
884bfe1918 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: Ie017be63fa26f1853a1709e663b0d06c8306feab
Chris Manton [Wed, 8 Dec 2021 00:05:13 +0000 (00:05 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
bdbdee6dfd am:
6a59bf886a am:
e9798276a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: Ic76e5d7ea9cf9fa4e88b8e6d69b95beaa8a4d2ec
TreeHugger Robot [Wed, 8 Dec 2021 00:05:03 +0000 (00:05 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
1178fa5aa5 am:
3a80ce8570 am:
4d5de97d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I914625660b43a74462f9c17ebe0a89a2d70df307
Chris Manton [Wed, 8 Dec 2021 00:04:54 +0000 (00:04 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
fc09ae706e -s ours am:
a582632547 -s ours am:
10990c787c -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: If01911060e8365e62a96f31d43d6d9ca7130473c
Chris Manton [Tue, 7 Dec 2021 23:50:11 +0000 (23:50 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
bdbdee6dfd am:
6a59bf886a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I702eaf704ae59c2b0f7f3ec856b843985e163a22
TreeHugger Robot [Tue, 7 Dec 2021 23:50:00 +0000 (23:50 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
1178fa5aa5 am:
3a80ce8570
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I02d91c35cdce9e939cec23ca8f830d47e6cf94f1
Chris Manton [Tue, 7 Dec 2021 23:49:53 +0000 (23:49 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
fc09ae706e -s ours am:
a582632547 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I43d7fac81dd0ad2d25dfd586d8d71a2bfd34f102
Chris Manton [Tue, 7 Dec 2021 23:26:05 +0000 (23:26 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
bdbdee6dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I41a25461abdf9eb5acb31f76106204c427ad1a61
TreeHugger Robot [Tue, 7 Dec 2021 23:25:57 +0000 (23:25 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
1178fa5aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I64dded8817fc77a043feb200b1868004fb2fc8bb
Chris Manton [Tue, 7 Dec 2021 23:25:37 +0000 (23:25 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
fc09ae706e -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: Ib47f6fa413d3e1e49475880935b92a32dc63453c
Chris Manton [Tue, 7 Dec 2021 22:08:58 +0000 (22:08 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I4cb9faed1b2099c11a517786082199c9bc9c041a
TreeHugger Robot [Tue, 7 Dec 2021 22:08:53 +0000 (22:08 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I1cdc2ec489a8d8b5a06edc414603470a1c2903df
Chris Manton [Tue, 7 Dec 2021 22:07:28 +0000 (22:07 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I01ac30b1546276dd352d1504b005c0fb04df3782
TreeHugger Robot [Tue, 7 Dec 2021 22:07:22 +0000 (22:07 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I8156732e845da8df49c84b0b29eb93a6b77760a8
Chris Manton [Tue, 7 Dec 2021 22:01:02 +0000 (22:01 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I3dda30c79df98e642d03b983b87e198c746d1f17
TreeHugger Robot [Tue, 7 Dec 2021 21:48:59 +0000 (21:48 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev
Chris Manton [Tue, 7 Dec 2021 21:41:16 +0000 (21:41 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I8478f605bd57517038ea1b39fccbce004416a82a
TreeHugger Robot [Tue, 7 Dec 2021 21:34:06 +0000 (21:34 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev
Chris Manton [Tue, 7 Dec 2021 21:25:17 +0000 (21:25 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I62206350a28a7c8b9a6cf9a726f16aa5898e46ba
Chris Manton [Tue, 7 Dec 2021 21:16:17 +0000 (21:16 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
ea8501068c am:
62be038f62
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207305
Change-Id: I47f7b8e6763091d76838819507f6e985186bbbd4
TreeHugger Robot [Tue, 7 Dec 2021 21:15:58 +0000 (21:15 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into sc-qpr1-dev am:
d5cc3871ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207304
Change-Id: I638f28dde93195bcb14955285742619067e6be4d
Chris Manton [Tue, 7 Dec 2021 21:15:42 +0000 (21:15 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: Ieaf344f4d3d55403e14fa0a90eed5d5679803c12
Chris Manton [Tue, 7 Dec 2021 21:14:11 +0000 (21:14 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I920888df5698795dc6fd8c7ba07649d6db31f812
Chris Manton [Tue, 7 Dec 2021 20:58:25 +0000 (20:58 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
ea8501068c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207305
Change-Id: I0b3f7f9849d220beea88182159c9ab704f8deea2
Chris Manton [Tue, 7 Dec 2021 20:56:38 +0000 (20:56 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I63645b73ea5aa28038a7ba8d21c31d6016567945
TreeHugger Robot [Tue, 7 Dec 2021 20:56:22 +0000 (20:56 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into sc-qpr1-dev
TreeHugger Robot [Tue, 7 Dec 2021 20:46:48 +0000 (20:46 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into sc-v2-dev
Chris Manton [Tue, 7 Dec 2021 20:39:20 +0000 (20:39 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I734c905871627bc0aa6dc177d4ac8b2845cc129a
TreeHugger Robot [Mon, 22 Nov 2021 19:02:28 +0000 (19:02 +0000)]
Merge "Clear identity bit when passing address to filter" into sc-v2-dev
Johnson Yang [Fri, 19 Nov 2021 15:35:45 +0000 (15:35 +0000)]
Merge "Disable sniff mode for Phonak device" into sc-qpr1-dev am:
d01fe3818c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16291302
Change-Id: Ieebb7d690e9d690d757c80bff4e86b2fd2052b1c
weichinweng [Fri, 19 Nov 2021 15:35:30 +0000 (15:35 +0000)]
HearingAid: set playback_started to true when the start audio command finishes. am:
07476e5570
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16258319
Change-Id: I6da23d551ae65fbdf21f1143ee45c77de49c4b7b
Johnson Yang [Fri, 19 Nov 2021 15:24:34 +0000 (15:24 +0000)]
Merge "Disable sniff mode for Phonak device" into sc-qpr1-dev
Jakub Pawlowski [Fri, 19 Nov 2021 11:10:52 +0000 (12:10 +0100)]
Clear identity bit when passing address to filter
Legacy stack kept Identity Address Type without the identity bit set.
It is later passed without any masking to "Add to accept list", "add to
resolving list", and VSC filter command. All these commands specify that
the identity bit should not be set in related specifications.
Test: manual test with DCK application
Bug:
201255908
Change-Id: Id68e81a6706ac40d7394e2803ec3339a7bc44a0a
Ted Wang [Thu, 18 Nov 2021 06:38:14 +0000 (14:38 +0800)]
Disable sniff mode for Phonak device
Phonak device does not handling well after entering sniff subrating
mode. Disable sniff mode to avoid this problem.
Tag: #compatibility
Bug:
16240099
Test: manual
Change-Id: I909d1bfe3106749bfa261b3977a207d1880dded0
Merged-In: I909d1bfe3106749bfa261b3977a207d1880dded0
Jakub Pawlowski [Tue, 16 Nov 2021 19:50:10 +0000 (19:50 +0000)]
Merge "Keep the IRK when the scan is finished" into sc-v2-dev
weichinweng [Mon, 15 Nov 2021 02:42:18 +0000 (10:42 +0800)]
HearingAid: set playback_started to true when the start audio command finishes.
Bug:
205679750
Tag: #compatibility
Test: 1. Paring from setting and and streaming play
2. HA battery remove and back reconnect
3. out of range reconnect
4. Paired from APP
Change-Id: I0a3e58b792bb12aa86f8ca9e1fe7a9d7bca58ec7
Merged-In: I0a3e58b792bb12aa86f8ca9e1fe7a9d7bca58ec7
Jakub Pawlowski [Mon, 8 Nov 2021 12:09:38 +0000 (13:09 +0100)]
Keep the IRK when the scan is finished
Bug:
201255908
Test: manually tested against phone with sample IRK scanning app
Change-Id: I58f8caf2c29bf2b12db2e595d42295b65dc4fa13
TreeHugger Robot [Fri, 12 Nov 2021 05:48:45 +0000 (05:48 +0000)]
Merge "Disable absolute volume control for Phonak" into sc-qpr1-dev am:
ff6a7e61c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16240099
Change-Id: Idcb9f50f6af66e003ec23ea727364aae23e81f96
TreeHugger Robot [Fri, 12 Nov 2021 05:35:02 +0000 (05:35 +0000)]
Merge "Disable absolute volume control for Phonak" into sc-qpr1-dev
Ted Wang [Thu, 11 Nov 2021 02:24:44 +0000 (10:24 +0800)]
Disable absolute volume control for Phonak
Phonak does not adjust volume with the level included in set absolute
volume command. Disable absolute volume control for Phonak to avoid
volume keep at max.
Tag: #compatibility
Bug:
204939205
Test: manual
Change-Id: I35d4d4e5231d67c46c2f5ea85f7e4364552892c4
Merged-In: I35d4d4e5231d67c46c2f5ea85f7e4364552892c4
Ted Wang [Thu, 11 Nov 2021 02:59:36 +0000 (02:59 +0000)]
Merge "Move offload start related flags from BTA_AV_SCB to BTA_AV_CB" into sc-v2-dev
TreeHugger Robot [Wed, 10 Nov 2021 02:08:06 +0000 (02:08 +0000)]
Merge "Reset the IRK after all devices are unpaired" into sc-v2-dev
Dowon Park [Tue, 9 Nov 2021 07:15:42 +0000 (07:15 +0000)]
Fix null pointer dereference in HACK_acl_check_sm4 am:
47ed17e0ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15727794
Change-Id: Id0f1adb3202376ed74863f51a1ef4cf751da59cf
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Dowon Park [Tue, 31 Aug 2021 08:17:32 +0000 (17:17 +0900)]
Fix null pointer dereference in HACK_acl_check_sm4
fix to return when p_acl is null to avoid null pointer dereference
problem.
Sponsor: cmanton@gmail.com
Bug:
198338740
Tag: #refactor
Test: gd/cert/run
Ignore-AOSP-First: Reliability
Change-Id: I45408a2b024dc424442bf3c2f92293b8942b54bb
Signed-off-by: Dowon Park <dowon.park@samsung.com>
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected
Bug:
201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975
Ted Wang [Fri, 5 Nov 2021 09:46:26 +0000 (09:46 +0000)]
[automerger skipped] [DO NOT MERGE]Move offload start related flags from BTA_AV_SCB to am:
48e95ea24c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16187625
Change-Id: I52e6390cd641e9538ead45a53dd86786bd647e35
Ted Wang [Mon, 25 Oct 2021 07:56:42 +0000 (15:56 +0800)]
Move offload start related flags from BTA_AV_SCB to BTA_AV_CB
Ignore a2dp offload start request when offloading already in progress.
Tag: #stability
Bug:
203127797
Test: Force to start offload duplicated
Change-Id: I99858852866e71d60200a798dd31d61a20b2669c
Merged-In: Id9fc670a79cf4a674ef104de8e7ad0a7676964ef
Ted Wang [Mon, 25 Oct 2021 07:56:42 +0000 (15:56 +0800)]
[DO NOT MERGE]Move offload start related flags from BTA_AV_SCB to
BTA_AV_CB
Ignore a2dp offload start request when offloading already in progress.
Tag: #stability
Bug:
203127797
Test: Force to start offload duplicated
Change-Id: I99858852866e71d60200a798dd31d61a20b2669c
Merged-In: I99858852866e71d60200a798dd31d61a20b2669c
Martin Brabham [Fri, 29 Oct 2021 21:27:27 +0000 (21:27 +0000)]
Reset the IRK after all devices are unpaired
Bug:
204355134
Bug:
195410559
Test: Check IRK, pair devices, unpair all devices, Check IRK
Tag: #security
Change-Id: I8e44f010a72dcdec595d81293a05f49ccc054065
Merged-In: I8e44f010a72dcdec595d81293a05f49ccc054065
Martin Brabham [Fri, 29 Oct 2021 21:27:27 +0000 (21:27 +0000)]
Reset the IRK after all devices are unpaired
Bug:
204355134
Bug:
195410559
Test: Check IRK, pair devices, unpair all devices, Check IRK
Tag: #security
Change-Id: I8e44f010a72dcdec595d81293a05f49ccc054065
Merged-In: I8e44f010a72dcdec595d81293a05f49ccc054065
More Kuo [Mon, 25 Oct 2021 02:36:27 +0000 (02:36 +0000)]
Merge "DO NOT MERGE: Enable Qualcomm 3804 log in snoop log with base 64 format" into sc-v2-dev
More Kuo [Fri, 15 Oct 2021 08:56:01 +0000 (16:56 +0800)]
DO NOT MERGE: Enable Qualcomm 3804 log in snoop log with base 64 format
Bug:
203015591
Tag: #feature
Test: manually checked content of partial btsnoop log
Ignore-AOSP-First: Enhanced log
Change-Id: I8e0e85b1493332405147f572cceaa24c56771a3d
Martin Brabham [Thu, 14 Oct 2021 20:02:59 +0000 (20:02 +0000)]
Fix possible NPE for UNKNOWN code path
Bug:
200595320
Test: Manual
Tag: #feature
Change-Id: I89b52553990bf58b8af304bab0bdd4cd8e8cb017
Merged-In: I89b52553990bf58b8af304bab0bdd4cd8e8cb017
Martin Brabham [Wed, 13 Oct 2021 18:27:43 +0000 (18:27 +0000)]
SMP API check for cached OOB data
If OOB data was generated before the pairing was attempted then use the
cached OOB data information for the pairing. We don't know if it is the
data for the particular device we are attempting to pair with, but it'll
either work or it won't. And if it doesn't, then it is likely not the
device we intended to pair with.
This will mean that Pixel will only perform double sided
OOB pairing IF it has previously created OOB data.
Data is removed on successful pairing or advertisement timeout.
When the device is the connector, it doesn't need to ask the
app for the OOB data since the OOB data is provided at the time
of create_bond_out_of_band being called.
This should fix the issue with double OOB data pairing scenarios where
this device is the device that initiates the bond.
Bug:
200595320
Test: Manual, test app.
Tag: #feature
Change-Id: Idd94a4ebe9ebeed57026fd915f499d509873e4f0
Merged-In: Idd94a4ebe9ebeed57026fd915f499d509873e4f0
Chris Manton [Wed, 6 Oct 2021 19:54:40 +0000 (19:54 +0000)]
Merge "osi: Prevent memory allocations with MSB set" into rvc-qpr-dev am:
3034c96552 am:
1f5dd6bdba am:
d4a884c71a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959599
Change-Id: I2259d50c80bbc76216aa8e65e5cddf9a830275ef
Chris Manton [Wed, 6 Oct 2021 19:39:11 +0000 (19:39 +0000)]
Merge "osi: Prevent memory allocations with MSB set" into rvc-qpr-dev am:
3034c96552 am:
1f5dd6bdba
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959599
Change-Id: Id564bb1c778e2230ea48d76d203e47479216788b
Chris Manton [Wed, 6 Oct 2021 19:30:51 +0000 (19:30 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716 am:
2cadbc6377 am:
2a995ed2ee am:
9cbaca4043
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I781c1232894090c5fcdfe1d97155fc04c884ffe1
Chris Manton [Wed, 6 Oct 2021 19:30:44 +0000 (19:30 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e am:
477c78d5e3 am:
418ede631f am:
80f269c513
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: Ife3582671e89604ab828e434b19fc48babe15e7b
Chris Manton [Wed, 6 Oct 2021 19:30:38 +0000 (19:30 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716 am:
d2596b6520 am:
e430264ba2 am:
04d1214cdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I1c1a82579b2fc8eed34e62577ba59367ff7e9e21
Chris Manton [Wed, 6 Oct 2021 19:30:30 +0000 (19:30 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e am:
e8c11e248e am:
ba7b1b8dc5 am:
bb7c9a0574
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I680a11bad2593e9be5143c0b3ff9477dde0b1d18
Chris Manton [Wed, 6 Oct 2021 19:29:36 +0000 (19:29 +0000)]
Merge "osi: Prevent memory allocations with MSB set" into rvc-qpr-dev am:
3034c96552
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959599
Change-Id: If6a8459b1f86d41c2b7913e5e45ed808884fb553
Chris Manton [Wed, 6 Oct 2021 19:21:12 +0000 (19:21 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716 am:
2cadbc6377 am:
2a995ed2ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I263be25fe5d31705f8b4fd0d907c7c5edda57f3a
Chris Manton [Wed, 6 Oct 2021 19:21:07 +0000 (19:21 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e am:
477c78d5e3 am:
418ede631f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I496fe0a0941ba593e2148e19005326b81f00e09c
Chris Manton [Wed, 6 Oct 2021 19:21:03 +0000 (19:21 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716 am:
d2596b6520 am:
e430264ba2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I0f4d512c6d527005d8a194c1da0a1841583317f6
Chris Manton [Wed, 6 Oct 2021 19:20:58 +0000 (19:20 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e am:
e8c11e248e am:
ba7b1b8dc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I6aa57d04dd4c85c781853d1c8ccec84a042a1d49
Chris Manton [Wed, 6 Oct 2021 19:17:56 +0000 (19:17 +0000)]
Merge "osi: Prevent memory allocations with MSB set" into rvc-qpr-dev
Chris Manton [Wed, 6 Oct 2021 19:06:03 +0000 (19:06 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716 am:
2cadbc6377
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I893e25ea34771c4f650ad22f647c03638df77e8d
Chris Manton [Wed, 6 Oct 2021 19:05:16 +0000 (19:05 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e am:
477c78d5e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I5acb4c7ebd3a994218023aeab327252ed2353484
Chris Manton [Wed, 6 Oct 2021 18:54:35 +0000 (18:54 +0000)]
osi: Prevent memory allocations with MSB set am:
e435404a7d am:
865d4f4214 am:
eacac971c2 am:
17512ac743
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959600
Change-Id: Ie9829ae9f032a0d2c6464028db24186c6b9f86c3
Chris Manton [Wed, 6 Oct 2021 18:54:31 +0000 (18:54 +0000)]
osi: Prevent memory allocations with MSB set am:
e435404a7d am:
ec15c0798b am:
b4060577b1 am:
e77476438c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959600
Change-Id: I62e317a9a980b73531c89639bffefc9336bd1be3
Chris Manton [Wed, 6 Oct 2021 18:53:45 +0000 (18:53 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716 am:
d2596b6520
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I954eaa7530d6c9f9aa9652cfbcc48cdbbc0a306f
Chris Manton [Wed, 6 Oct 2021 18:53:38 +0000 (18:53 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e am:
e8c11e248e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I5c6e608a88165a6b8e72ecf42717b90212eb0165
Chris Manton [Wed, 6 Oct 2021 18:39:28 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
e435404a7d am:
865d4f4214 am:
eacac971c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959600
Change-Id: I96ba920ef13a419749253ac136b917e140bfeca7
Chris Manton [Wed, 6 Oct 2021 18:39:26 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
e435404a7d am:
ec15c0798b am:
b4060577b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959600
Change-Id: I6525cdadaa71c2a970d307ff7a37ed8941ab11ca
Chris Manton [Wed, 6 Oct 2021 18:39:24 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I60ce82f68eb256b8a786f8127fe21c38d0ee1833
Chris Manton [Wed, 6 Oct 2021 18:39:24 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: Ifc1b529263fd24774cef4ffab422bc4bcd334901
Chris Manton [Wed, 6 Oct 2021 18:39:20 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I7c21d6dfe0efe6812259cea7b839120a3cd58ac1
Chris Manton [Wed, 6 Oct 2021 18:39:20 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I03b2dbdb3dd187880383a26fedf10cb4f06ff670
Chris Manton [Wed, 6 Oct 2021 18:24:18 +0000 (18:24 +0000)]
osi: Prevent memory allocations with MSB set am:
e435404a7d am:
865d4f4214
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959600
Change-Id: Ia474ae0cada1cf3966d31851059dfe6bc87f45f2
Chris Manton [Wed, 6 Oct 2021 18:24:04 +0000 (18:24 +0000)]
osi: Prevent memory allocations with MSB set am:
a1184057b2 am:
c4935a845a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959598
Change-Id: I0593ec83e6fe321b88c4200ba548923fa7e6a021
Chris Manton [Wed, 6 Oct 2021 18:23:49 +0000 (18:23 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: Ice95438b8dbce78342490c360887246f7c5a1cb6