OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "Rootcanal: fix typos in handling CIS" am: 1556cb8a14 am: a0f17390ff
Treehugger Robot [Thu, 18 Feb 2021 20:29:50 +0000 (20:29 +0000)]
Merge "Rootcanal: fix typos in handling CIS" am: 1556cb8a14 am: a0f17390ff

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1591915

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf6ddfe374cda0a024847349707df4757a6cc7b1

3 years agoMerge "Rootcanal: fix typos in handling CIS" am: 1556cb8a14
Treehugger Robot [Thu, 18 Feb 2021 19:58:33 +0000 (19:58 +0000)]
Merge "Rootcanal: fix typos in handling CIS" am: 1556cb8a14

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1591915

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19f4fdccb4901e75d58e7463fc2ff3bef09ed8b2

3 years agoMerge "Rootcanal: fix typos in handling CIS"
Treehugger Robot [Thu, 18 Feb 2021 18:21:11 +0000 (18:21 +0000)]
Merge "Rootcanal: fix typos in handling CIS"

3 years agoMerge "btaa: add btaa into the shim" am: ed708c0cad am: 26eeba7efa
Treehugger Robot [Thu, 18 Feb 2021 09:43:07 +0000 (09:43 +0000)]
Merge "btaa: add btaa into the shim" am: ed708c0cad am: 26eeba7efa

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1508618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf41feb02d6e048ea0e25f1ef0911fd80b20a15a

3 years agoMerge "btaa: add btaa into the shim" am: ed708c0cad
Treehugger Robot [Thu, 18 Feb 2021 09:18:21 +0000 (09:18 +0000)]
Merge "btaa: add btaa into the shim" am: ed708c0cad

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1508618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84726f40471f5b6ae91bd7e19491e55f259850b4

3 years agoMerge "btaa: add btaa into the shim"
Treehugger Robot [Thu, 18 Feb 2021 07:56:25 +0000 (07:56 +0000)]
Merge "btaa: add btaa into the shim"

3 years agoMerge "rusty-gd: Add missing GAP data types and fix EIR length" am: 55da113b73 am...
Qasim Javed [Thu, 18 Feb 2021 04:09:46 +0000 (04:09 +0000)]
Merge "rusty-gd: Add missing GAP data types and fix EIR length" am: 55da113b73 am: 264e6cc9d0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1593171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibed1da51542a057b89044b0e96981ae6133ce420

3 years agoMerge "rusty-gd: Add missing GAP data types and fix EIR length" am: 55da113b73
Qasim Javed [Thu, 18 Feb 2021 03:22:53 +0000 (03:22 +0000)]
Merge "rusty-gd: Add missing GAP data types and fix EIR length" am: 55da113b73

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1593171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3532021f388b15c9b82153d3bc052b2bde5a61b

3 years agoMerge "rusty-gd: Add missing GAP data types and fix EIR length"
Qasim Javed [Thu, 18 Feb 2021 02:53:23 +0000 (02:53 +0000)]
Merge "rusty-gd: Add missing GAP data types and fix EIR length"

3 years agoMerge "Add max_connected_audio_devices parameter to A2DP Sink init" am: 3323d52ecb...
Sal Savage [Wed, 17 Feb 2021 22:25:07 +0000 (22:25 +0000)]
Merge "Add max_connected_audio_devices parameter to A2DP Sink init" am: 3323d52ecb am: 780f5f7c71

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1585098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05badfb666e8c517915df71e0cc4501960950903

3 years agorusty-gd: Add missing GAP data types and fix EIR length
Qasim Javed [Wed, 17 Feb 2021 21:39:07 +0000 (13:39 -0800)]
rusty-gd: Add missing GAP data types and fix EIR length

Devices with EIR containing Gap data type 0x10 were not showing up in
the pairing list.

Tested using Pixel Buds. They now show up in the pairing dialog. When
tapped, pairing still fails.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest

Change-Id: I00c90b6ca4ab0bb5eca97202f7652f35260197c4

3 years agoMerge "Add max_connected_audio_devices parameter to A2DP Sink init" am: 3323d52ecb
Sal Savage [Wed, 17 Feb 2021 21:45:38 +0000 (21:45 +0000)]
Merge "Add max_connected_audio_devices parameter to A2DP Sink init" am: 3323d52ecb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1585098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0125d22dad3f4b76b950ac4a88c9c19f2aa5fd8d

3 years agoMerge "Add max_connected_audio_devices parameter to A2DP Sink init"
Sal Savage [Wed, 17 Feb 2021 21:01:57 +0000 (21:01 +0000)]
Merge "Add max_connected_audio_devices parameter to A2DP Sink init"

3 years agoMerge "btaa: introduce btaa module into gd" am: 65aaab254d am: 202d7f589c
Treehugger Robot [Wed, 17 Feb 2021 20:12:52 +0000 (20:12 +0000)]
Merge "btaa: introduce btaa module into gd" am: 65aaab254d am: 202d7f589c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1508617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0badd7732e920a2ade5bfe12143188318004ec5d

3 years agoMerge "btaa: introduce btaa module into gd" am: 65aaab254d
Treehugger Robot [Wed, 17 Feb 2021 19:26:23 +0000 (19:26 +0000)]
Merge "btaa: introduce btaa module into gd" am: 65aaab254d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1508617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c2e7e0c5731397c0a7b57d2c90b93e38125d9b3

3 years agobtaa: add btaa into the shim
Michael Sun [Mon, 23 Nov 2020 17:51:04 +0000 (17:51 +0000)]
btaa: add btaa into the shim

Add btaa module into the shim. Implemented various helper functions.

Tag: #feature
Bug: 172501038
Test: m
Change-Id: I23b86a7b75ad301aae62d47ca34a5524a60844a1

3 years agoMerge "btaa: introduce btaa module into gd"
Treehugger Robot [Wed, 17 Feb 2021 18:17:25 +0000 (18:17 +0000)]
Merge "btaa: introduce btaa module into gd"

3 years agoRootcanal fix typo - return success am: 3e805952c1 am: 0111376193
Jakub Pawlowski [Wed, 17 Feb 2021 16:07:07 +0000 (16:07 +0000)]
Rootcanal fix typo - return success am: 3e805952c1 am: 0111376193

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1590911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f9c271fd0e62b558fe6c7e84ba96e3dfeee3dc5

3 years agoRootcanal: fix typos in handling CIS
Jakub Pawlowski [Wed, 17 Feb 2021 15:44:08 +0000 (16:44 +0100)]
Rootcanal: fix typos in handling CIS

* fix order of some badly passed parameters
* add/fix error log messages

Change-Id: Ie13580b6051a6afa15615b634d9c42ae0fd5f5d6

3 years agoRootcanal fix typo - return success am: 3e805952c1
Jakub Pawlowski [Wed, 17 Feb 2021 15:30:44 +0000 (15:30 +0000)]
Rootcanal fix typo - return success am: 3e805952c1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1590911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec7c9a47b396d722645f0daa7b6929d5b1765767

3 years agoRootcanal fix typo - return success
Jakub Pawlowski [Tue, 16 Feb 2021 22:36:20 +0000 (23:36 +0100)]
Rootcanal fix typo - return success

Test: run the not yet existing ISO tests
Change-Id: Ie3b2674336d2b97297d1be96b97351c4a82676aa

3 years agoMerge "Send Bluetooth call quality report to telephony" am: 7817f3fa87 am: c47e69920c
Treehugger Robot [Wed, 17 Feb 2021 00:42:10 +0000 (00:42 +0000)]
Merge "Send Bluetooth call quality report to telephony" am: 7817f3fa87 am: c47e69920c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1576757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b4395b80c50392c427871098221d0335019b321

3 years agoMerge "Fix test for googletest upgrade" am: b0ba4e8a76 am: 7d5f8ecf85
Haibo Huang [Wed, 17 Feb 2021 00:42:00 +0000 (00:42 +0000)]
Merge "Fix test for googletest upgrade" am: b0ba4e8a76 am: 7d5f8ecf85

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1581588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa910487da8c73dc2b2ed950e884c33610a4f8b2

3 years agoMerge "Send Bluetooth call quality report to telephony" am: 7817f3fa87
Treehugger Robot [Wed, 17 Feb 2021 00:11:47 +0000 (00:11 +0000)]
Merge "Send Bluetooth call quality report to telephony" am: 7817f3fa87

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1576757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77e7bd61e746e0f456fb5e4324040ca7ed368bd8

3 years agoMerge "Fix test for googletest upgrade" am: b0ba4e8a76
Haibo Huang [Wed, 17 Feb 2021 00:10:55 +0000 (00:10 +0000)]
Merge "Fix test for googletest upgrade" am: b0ba4e8a76

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1581588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic05c50853aa6c594dee1a5ccc5fa8db5464b9151

3 years agoMerge "Send Bluetooth call quality report to telephony"
Treehugger Robot [Wed, 17 Feb 2021 00:00:08 +0000 (00:00 +0000)]
Merge "Send Bluetooth call quality report to telephony"

3 years agoMerge "Fix test for googletest upgrade"
Haibo Huang [Tue, 16 Feb 2021 23:38:09 +0000 (23:38 +0000)]
Merge "Fix test for googletest upgrade"

3 years agoMerge "Wipe cache when HID report cache isn't compatible with the current cache versi...
Treehugger Robot [Tue, 16 Feb 2021 23:35:25 +0000 (23:35 +0000)]
Merge "Wipe cache when HID report cache isn't compatible with the current cache version." am: 749630bc91 am: 73f756c1ae

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1589738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb5a84de8f4a37790d728b0c364b12fe3953d99f

3 years agoMerge "Wipe cache when HID report cache isn't compatible with the current cache versi...
Treehugger Robot [Tue, 16 Feb 2021 23:14:51 +0000 (23:14 +0000)]
Merge "Wipe cache when HID report cache isn't compatible with the current cache version." am: 749630bc91

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1589738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib53949670bb035d5a52dddd52e333a45d872cb0e

3 years agoMerge "Wipe cache when HID report cache isn't compatible with the current cache version."
Treehugger Robot [Tue, 16 Feb 2021 22:39:02 +0000 (22:39 +0000)]
Merge "Wipe cache when HID report cache isn't compatible with the current cache version."

3 years agoRemove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init am: 37abdec7c8...
Chris Manton [Tue, 16 Feb 2021 22:27:21 +0000 (22:27 +0000)]
Remove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init am: 37abdec7c8 am: b6a6bac821

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If43a8574e5997d462a45291ede0e867ccf36127b

3 years agoRemove unneccesary API BTM_GetAcceptlistSize am: c36db90f1a am: 87e1a08520
Chris Manton [Tue, 16 Feb 2021 22:27:19 +0000 (22:27 +0000)]
Remove unneccesary API BTM_GetAcceptlistSize am: c36db90f1a am: 87e1a08520

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584709

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7280d87c4a339bce594cae7eef9da7397e8d8bf3

3 years agoFix for gd_acl le connections am: c6e78147e1 am: fffdd54933
Chris Manton [Tue, 16 Feb 2021 22:27:16 +0000 (22:27 +0000)]
Fix for gd_acl le connections am: c6e78147e1 am: fffdd54933

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If49df92f96a0b14f3022b525ed55e13abdcc4849

3 years agogd_acl: Add add/remove acceptlist am: 3467d21d29 am: 61c79b3e17
Chris Manton [Tue, 16 Feb 2021 22:27:14 +0000 (22:27 +0000)]
gd_acl: Add add/remove acceptlist am: 3467d21d29 am: 61c79b3e17

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief03b78bc35f40efeb7169da944d134507f64ec2

3 years agoEnum-ify bta/include/bta_hh_api::tBTA_HH_STATUS am: 1813bfcc17 am: 9199eeef86
Chris Manton [Tue, 16 Feb 2021 22:27:12 +0000 (22:27 +0000)]
Enum-ify bta/include/bta_hh_api::tBTA_HH_STATUS am: 1813bfcc17 am: 9199eeef86

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584706

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcb7a6c7061d2ad468a1e7f2c249ae6c38f6c97c

3 years agoRe-log stack/btm/btm_sec::btm_sec_is_a_bonded_dev am: c472a55125 am: 578889d358
Chris Manton [Tue, 16 Feb 2021 22:27:10 +0000 (22:27 +0000)]
Re-log stack/btm/btm_sec::btm_sec_is_a_bonded_dev am: c472a55125 am: 578889d358

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I049f15a2381c730c0c015053803b42357e3cdda1

3 years agoRe-log stack/btm/btm_ble_privacy::btm_ble_suspend_resolving_list_activity am: 87b3dc4...
Chris Manton [Tue, 16 Feb 2021 22:27:08 +0000 (22:27 +0000)]
Re-log stack/btm/btm_ble_privacy::btm_ble_suspend_resolving_list_activity am: 87b3dc4559 am: 99f71a6b88

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584704

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If99633e7348337d1566d5bc8547602504631692c

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_update_mode_operation am: 81a26a1365 am: 2a333f08b3
Chris Manton [Tue, 16 Feb 2021 22:27:06 +0000 (22:27 +0000)]
Re-log stack/btm/btm_ble_gap::btm_ble_update_mode_operation am: 81a26a1365 am: 2a333f08b3

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584703

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I006cfd44bc8e3b9b6225c95e80542f6f6240884e

3 years agoUse proper types tHCI_STATUS am: d047f92771 am: 0c0c3e408b
Chris Manton [Tue, 16 Feb 2021 22:27:04 +0000 (22:27 +0000)]
Use proper types tHCI_STATUS am: d047f92771 am: 0c0c3e408b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e91c87667fa6b5bf874fb20789ec101e59ae006

3 years agoRe-log stack/smp/smp_l2c::smp_connect_callback am: 12e591c2e9 am: fb52f54c58
Chris Manton [Tue, 16 Feb 2021 22:27:03 +0000 (22:27 +0000)]
Re-log stack/smp/smp_l2c::smp_connect_callback am: 12e591c2e9 am: fb52f54c58

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32cb9c87248029c4a36febffc996a2cc01e7f38b

3 years agogd_acl: Assert on paths when gd_acl enabled am: 06d050075f am: bff29c8d6b
Chris Manton [Tue, 16 Feb 2021 22:27:01 +0000 (22:27 +0000)]
gd_acl: Assert on paths when gd_acl enabled am: 06d050075f am: bff29c8d6b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584420

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c1bf6be67c55f994f09addb2af13ab617c993aa

3 years agoRe-layout stack/btm/btm_ble_bgconn.cc am: 16584d39d7 am: be345c1b32
Chris Manton [Tue, 16 Feb 2021 22:26:59 +0000 (22:26 +0000)]
Re-layout stack/btm/btm_ble_bgconn.cc am: 16584d39d7 am: be345c1b32

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie632aeab9b4897a9b81adb5ccefcced446a2b9de

3 years agoRe-log stack/gatt/gatt_api::GATT_Connect am: 6c58e3a5aa am: 617bfd7d9e
Chris Manton [Tue, 16 Feb 2021 22:26:57 +0000 (22:26 +0000)]
Re-log stack/gatt/gatt_api::GATT_Connect am: 6c58e3a5aa am: 617bfd7d9e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584418

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a00e1e7c7ecab2eb1489edac29009f84a8c79bf

3 years agoRe-log stack/smp/smp_l2c::smp_connect_callback am: 6e77382867 am: 60c972e29e
Chris Manton [Tue, 16 Feb 2021 22:26:55 +0000 (22:26 +0000)]
Re-log stack/smp/smp_l2c::smp_connect_callback am: 6e77382867 am: 60c972e29e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47c090017126cdf545c58535dd9c20452c0d97e2

3 years agoRe-log stack/gap/gap_ble::client_connect_cback am: 2538d35f32 am: a61685c68c
Chris Manton [Tue, 16 Feb 2021 22:26:54 +0000 (22:26 +0000)]
Re-log stack/gap/gap_ble::client_connect_cback am: 2538d35f32 am: a61685c68c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584416

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50f2d30b5c8640e4191eb5291feb7a79840cce07

3 years agoRe-log bta/gatt/bta_gattc_act::bta_gattc_close am: ba345ad12b am: 30df5c066a
Chris Manton [Tue, 16 Feb 2021 22:26:52 +0000 (22:26 +0000)]
Re-log bta/gatt/bta_gattc_act::bta_gattc_close am: ba345ad12b am: 30df5c066a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b439c31c46f9296824b1470c9d83444d3aa395b

3 years agoGroup internally linked functions stack/btm/btm_ble_bgconn am: 137b24d59a am: 3044cb9cce
Chris Manton [Tue, 16 Feb 2021 22:26:50 +0000 (22:26 +0000)]
Group internally linked functions stack/btm/btm_ble_bgconn am: 137b24d59a am: 3044cb9cce

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7605fee45a2b2b4d4310f7cd0f6c64a94912ed54

3 years agoDirectly query controller for acceptlist size am: 1709788a73 am: 16e4389763
Chris Manton [Tue, 16 Feb 2021 22:26:48 +0000 (22:26 +0000)]
Directly query controller for acceptlist size am: 1709788a73 am: 16e4389763

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I987e321dcea34ef462e73d6c356be27d6a35f321

3 years agoAdd API for tBTM_SEC_DEV_REC::has_ble am: 7a3122e52a am: c41edef52c
Chris Manton [Tue, 16 Feb 2021 22:26:46 +0000 (22:26 +0000)]
Add API for tBTM_SEC_DEV_REC::has_ble am: 7a3122e52a am: c41edef52c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1585528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib04e0765d80395091b95a232e40e565825e085b2

3 years agoReduce unneeded namespace resolution main/shim/acl am: 5fdab5b5c5 am: b3ae3e59e6
Chris Manton [Tue, 16 Feb 2021 22:26:45 +0000 (22:26 +0000)]
Reduce unneeded namespace resolution main/shim/acl am: 5fdab5b5c5 am: b3ae3e59e6

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bc0b0a2decb2ad8bac3f53cdb3cfea5d1c247be

3 years agoIntroduce bta_test am: f02b313b7e am: addb3933eb
Chris Manton [Tue, 16 Feb 2021 22:26:43 +0000 (22:26 +0000)]
Introduce bta_test am: f02b313b7e am: addb3933eb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I456115310b48b0fe0cfc93d5801c8d857d563b3f

3 years agoIntroduce bta/test mocks and fakes am: db6f7631cf am: 035ca6c566
Chris Manton [Tue, 16 Feb 2021 22:26:41 +0000 (22:26 +0000)]
Introduce bta/test mocks and fakes am: db6f7631cf am: 035ca6c566

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I669fab7ccd5d759fb6d0b384f03138f62c021e9e

3 years agoRemove unnecessary include bta/hh/bta_hh_act.cc::log am: ac903002a1 am: 7df70f23cd
Chris Manton [Tue, 16 Feb 2021 22:26:39 +0000 (22:26 +0000)]
Remove unnecessary include bta/hh/bta_hh_act.cc::log am: ac903002a1 am: 7df70f23cd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieedbecb5792c4860b2a06d0fe2fe7e7844c44a94

3 years agoDeclare bta/dm/bta_dm_int::deinit am: ad212e5b8e am: c6ab31a49b
Chris Manton [Tue, 16 Feb 2021 22:26:37 +0000 (22:26 +0000)]
Declare bta/dm/bta_dm_int::deinit am: ad212e5b8e am: c6ab31a49b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If69442a11ca9fbcd1d6a4341e5296f100b017a3f

3 years agoRe-layout stack/acl/btm_acl::btm_remove_acl am: 5aec007a31 am: e8ec028bfe
Chris Manton [Tue, 16 Feb 2021 22:26:35 +0000 (22:26 +0000)]
Re-layout stack/acl/btm_acl::btm_remove_acl am: 5aec007a31 am: e8ec028bfe

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1574625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bc30497b247b2913bdc769c0a70c4a67b5e790c

3 years agobt_headless: Various updates am: 3ae680043f am: c05f2d3e36
Chris Manton [Tue, 16 Feb 2021 22:26:34 +0000 (22:26 +0000)]
bt_headless: Various updates am: 3ae680043f am: c05f2d3e36

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I385f4ed8a8149a8bd17ad2a8e630e027bba48812

3 years agogd_acl: Connect gd acl shutdown am: e1b60a1217 am: ba5e6c2cd6
Chris Manton [Tue, 16 Feb 2021 22:26:32 +0000 (22:26 +0000)]
gd_acl: Connect gd acl shutdown am: e1b60a1217 am: ba5e6c2cd6

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7721f374b52efff92675639f80059ed1a062b904

3 years agoRe-log bta/dm/bta_dm_act::bta_dm_disable_conn_down_timer_cback am: 38f64f9627 am...
Chris Manton [Tue, 16 Feb 2021 22:26:30 +0000 (22:26 +0000)]
Re-log bta/dm/bta_dm_act::bta_dm_disable_conn_down_timer_cback am: 38f64f9627 am: 85afa87b6c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie05a86afa007224e161f374a69441db02dc9bb6d

3 years agoRe-log btif/src/btif_dm::BTIF_dm_disable am: c9978e41af am: 5ab42ee3af
Chris Manton [Tue, 16 Feb 2021 22:26:28 +0000 (22:26 +0000)]
Re-log btif/src/btif_dm::BTIF_dm_disable am: c9978e41af am: 5ab42ee3af

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27cdaf72ca26419847f80792796290814450de22

3 years agoRe-log stack/avdt/avdt_api::AVDT_Connect am: d20f5ef3aa am: 417c0995d4
Chris Manton [Tue, 16 Feb 2021 22:26:27 +0000 (22:26 +0000)]
Re-log stack/avdt/avdt_api::AVDT_Connect am: d20f5ef3aa am: 417c0995d4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94df3cab268a37cb1f15e57e198ab6d7a5984b76

3 years agoRe-log stack/avdt/avdt_api::AVDT_DisconnectReq am: c499f12040 am: 5bcc662b84
Chris Manton [Tue, 16 Feb 2021 22:26:25 +0000 (22:26 +0000)]
Re-log stack/avdt/avdt_api::AVDT_DisconnectReq am: c499f12040 am: 5bcc662b84

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e8b2d238bf085c808c2d2152ed429bef899757

3 years agoEnum-ify stack/include/avdt_api::tAVDT_RESULT am: 204e013fde am: 79643212f7
Chris Manton [Tue, 16 Feb 2021 22:26:23 +0000 (22:26 +0000)]
Enum-ify stack/include/avdt_api::tAVDT_RESULT am: 204e013fde am: 79643212f7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ebf03515e9767b6ec569cca16887f143ad9552d

3 years agoRe-log l2c_link_hci_conn_comp am: 1dd70c4cc8 am: 6dfeba5ac8
Chris Manton [Tue, 16 Feb 2021 22:26:21 +0000 (22:26 +0000)]
Re-log l2c_link_hci_conn_comp am: 1dd70c4cc8 am: 6dfeba5ac8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id43c7d91a2c53ff420c8f30a8e1509190d48f09d

3 years agoRemove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init am: 37abdec7c8
Chris Manton [Tue, 16 Feb 2021 22:04:34 +0000 (22:04 +0000)]
Remove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init am: 37abdec7c8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1aae4618c48d599eaf566cee7de76c9b87fb851

3 years agoRemove unneccesary API BTM_GetAcceptlistSize am: c36db90f1a
Chris Manton [Tue, 16 Feb 2021 22:04:30 +0000 (22:04 +0000)]
Remove unneccesary API BTM_GetAcceptlistSize am: c36db90f1a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584709

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81a35abe1c7cfab40b9569f06a3b0a8522cf5335

3 years agoFix for gd_acl le connections am: c6e78147e1
Chris Manton [Tue, 16 Feb 2021 22:04:27 +0000 (22:04 +0000)]
Fix for gd_acl le connections am: c6e78147e1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1943aa2e826781b77f7d454802f41696d154c28

3 years agogd_acl: Add add/remove acceptlist am: 3467d21d29
Chris Manton [Tue, 16 Feb 2021 22:04:23 +0000 (22:04 +0000)]
gd_acl: Add add/remove acceptlist am: 3467d21d29

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30bded4c4b92ff865e06a9a218b4d797077b25e1

3 years agoEnum-ify bta/include/bta_hh_api::tBTA_HH_STATUS am: 1813bfcc17
Chris Manton [Tue, 16 Feb 2021 22:03:22 +0000 (22:03 +0000)]
Enum-ify bta/include/bta_hh_api::tBTA_HH_STATUS am: 1813bfcc17

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584706

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I235f9d539f016fbe541f1ed32662c9105729dace

3 years agoRe-log stack/btm/btm_sec::btm_sec_is_a_bonded_dev am: c472a55125
Chris Manton [Tue, 16 Feb 2021 22:02:28 +0000 (22:02 +0000)]
Re-log stack/btm/btm_sec::btm_sec_is_a_bonded_dev am: c472a55125

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17d61a40fcb5a2f5484783cda4522a648d4c46ae

3 years agoRe-log stack/btm/btm_ble_privacy::btm_ble_suspend_resolving_list_activity am: 87b3dc4559
Chris Manton [Tue, 16 Feb 2021 22:02:25 +0000 (22:02 +0000)]
Re-log stack/btm/btm_ble_privacy::btm_ble_suspend_resolving_list_activity am: 87b3dc4559

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584704

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49ce1fbc73b24639bafd18d00aa73d944d596a04

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_update_mode_operation am: 81a26a1365
Chris Manton [Tue, 16 Feb 2021 22:02:21 +0000 (22:02 +0000)]
Re-log stack/btm/btm_ble_gap::btm_ble_update_mode_operation am: 81a26a1365

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584703

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9e2233e30fd1cd605a24a8237a3c6b7d27a9e7d

3 years agoUse proper types tHCI_STATUS am: d047f92771
Chris Manton [Tue, 16 Feb 2021 22:02:18 +0000 (22:02 +0000)]
Use proper types tHCI_STATUS am: d047f92771

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f77a708fc9cdcc8a0355f2eaeb86be57f744a54

3 years agoRe-log stack/smp/smp_l2c::smp_connect_callback am: 12e591c2e9
Chris Manton [Tue, 16 Feb 2021 22:02:15 +0000 (22:02 +0000)]
Re-log stack/smp/smp_l2c::smp_connect_callback am: 12e591c2e9

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I013f184ed57f5049eccb38cc1dfe98e0bda7b3af

3 years agogd_acl: Assert on paths when gd_acl enabled am: 06d050075f
Chris Manton [Tue, 16 Feb 2021 22:02:11 +0000 (22:02 +0000)]
gd_acl: Assert on paths when gd_acl enabled am: 06d050075f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584420

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id172e40435d9ece6c0f5ac856fdcb8d61d1e546f

3 years agoRe-layout stack/btm/btm_ble_bgconn.cc am: 16584d39d7
Chris Manton [Tue, 16 Feb 2021 22:02:07 +0000 (22:02 +0000)]
Re-layout stack/btm/btm_ble_bgconn.cc am: 16584d39d7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95f96b66b80c9bab0b32e18a5d0eb859cd2d3eaa

3 years agoRe-log stack/gatt/gatt_api::GATT_Connect am: 6c58e3a5aa
Chris Manton [Tue, 16 Feb 2021 22:02:02 +0000 (22:02 +0000)]
Re-log stack/gatt/gatt_api::GATT_Connect am: 6c58e3a5aa

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584418

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2541c6be451b543e8c87b5c65f7a6a56a41857b

3 years agoRe-log stack/smp/smp_l2c::smp_connect_callback am: 6e77382867
Chris Manton [Tue, 16 Feb 2021 22:01:59 +0000 (22:01 +0000)]
Re-log stack/smp/smp_l2c::smp_connect_callback am: 6e77382867

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia73d0c709964db5182931426b1e39fe707ab341b

3 years agoRe-log stack/gap/gap_ble::client_connect_cback am: 2538d35f32
Chris Manton [Tue, 16 Feb 2021 22:01:56 +0000 (22:01 +0000)]
Re-log stack/gap/gap_ble::client_connect_cback am: 2538d35f32

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584416

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa66575fc365ab5ed533e790d1acf8585a95eb98

3 years agoRe-log bta/gatt/bta_gattc_act::bta_gattc_close am: ba345ad12b
Chris Manton [Tue, 16 Feb 2021 22:01:52 +0000 (22:01 +0000)]
Re-log bta/gatt/bta_gattc_act::bta_gattc_close am: ba345ad12b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffab3921153c18b1f2745811dbf564fc7664091f

3 years agoGroup internally linked functions stack/btm/btm_ble_bgconn am: 137b24d59a
Chris Manton [Tue, 16 Feb 2021 22:01:49 +0000 (22:01 +0000)]
Group internally linked functions stack/btm/btm_ble_bgconn am: 137b24d59a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I298fa0b8a1b56343db7df7e748b02414b5a10cc5

3 years agoDirectly query controller for acceptlist size am: 1709788a73
Chris Manton [Tue, 16 Feb 2021 22:01:45 +0000 (22:01 +0000)]
Directly query controller for acceptlist size am: 1709788a73

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If45bd0c60e6cd9216138b8442bd9e066c21e11c3

3 years agoAdd API for tBTM_SEC_DEV_REC::has_ble am: 7a3122e52a
Chris Manton [Tue, 16 Feb 2021 22:01:42 +0000 (22:01 +0000)]
Add API for tBTM_SEC_DEV_REC::has_ble am: 7a3122e52a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1585528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic22701a10d31971f5922275f30d551d406ef63ec

3 years agoReduce unneeded namespace resolution main/shim/acl am: 5fdab5b5c5
Chris Manton [Tue, 16 Feb 2021 22:01:39 +0000 (22:01 +0000)]
Reduce unneeded namespace resolution main/shim/acl am: 5fdab5b5c5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1584412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I243bd3ea2bb399429e82112992e7569f691f608c

3 years agoIntroduce bta_test am: f02b313b7e
Chris Manton [Tue, 16 Feb 2021 22:01:36 +0000 (22:01 +0000)]
Introduce bta_test am: f02b313b7e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b44e0427f015d40b715a0e53055d997eb091b9c

3 years agoIntroduce bta/test mocks and fakes am: db6f7631cf
Chris Manton [Tue, 16 Feb 2021 22:01:32 +0000 (22:01 +0000)]
Introduce bta/test mocks and fakes am: db6f7631cf

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7927e957b301b639746e5ed0fc56eb675dc7f50

3 years agoRemove unnecessary include bta/hh/bta_hh_act.cc::log am: ac903002a1
Chris Manton [Tue, 16 Feb 2021 22:01:28 +0000 (22:01 +0000)]
Remove unnecessary include bta/hh/bta_hh_act.cc::log am: ac903002a1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77c70e4761b0a608cc4874dd88ffb62fcf0b5ec9

3 years agoDeclare bta/dm/bta_dm_int::deinit am: ad212e5b8e
Chris Manton [Tue, 16 Feb 2021 22:01:25 +0000 (22:01 +0000)]
Declare bta/dm/bta_dm_int::deinit am: ad212e5b8e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1580480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ad322e3e80cc062ec52399b985981b4935a2c36

3 years agoRe-layout stack/acl/btm_acl::btm_remove_acl am: 5aec007a31
Chris Manton [Tue, 16 Feb 2021 22:01:21 +0000 (22:01 +0000)]
Re-layout stack/acl/btm_acl::btm_remove_acl am: 5aec007a31

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1574625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief7c2327c1ceb95d467d78ffda433bef537491eb

3 years agobt_headless: Various updates am: 3ae680043f
Chris Manton [Tue, 16 Feb 2021 22:01:18 +0000 (22:01 +0000)]
bt_headless: Various updates am: 3ae680043f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1603adfd3efc35c8eb7a1ce6a4ade7a14dd0d6c

3 years agogd_acl: Connect gd acl shutdown am: e1b60a1217
Chris Manton [Tue, 16 Feb 2021 22:01:14 +0000 (22:01 +0000)]
gd_acl: Connect gd acl shutdown am: e1b60a1217

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b19c4232c9acc7efb243595d3a9c1ca7e6f70c7

3 years agoRe-log bta/dm/bta_dm_act::bta_dm_disable_conn_down_timer_cback am: 38f64f9627
Chris Manton [Tue, 16 Feb 2021 22:01:08 +0000 (22:01 +0000)]
Re-log bta/dm/bta_dm_act::bta_dm_disable_conn_down_timer_cback am: 38f64f9627

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27da97e6c106355aadf5aaa40cf1791b9655d791

3 years agoRe-log btif/src/btif_dm::BTIF_dm_disable am: c9978e41af
Chris Manton [Tue, 16 Feb 2021 22:01:04 +0000 (22:01 +0000)]
Re-log btif/src/btif_dm::BTIF_dm_disable am: c9978e41af

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80aec7a56c96792d67bcc24924727610c3277899

3 years agoRe-log stack/avdt/avdt_api::AVDT_Connect am: d20f5ef3aa
Chris Manton [Tue, 16 Feb 2021 22:01:01 +0000 (22:01 +0000)]
Re-log stack/avdt/avdt_api::AVDT_Connect am: d20f5ef3aa

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7529f58ac46b28ac72cb6a2ae6634a7fb7cb0a5a

3 years agoRe-log stack/avdt/avdt_api::AVDT_DisconnectReq am: c499f12040
Chris Manton [Tue, 16 Feb 2021 22:00:56 +0000 (22:00 +0000)]
Re-log stack/avdt/avdt_api::AVDT_DisconnectReq am: c499f12040

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If49529ca69283a540fe7aafa75ed997a5b4e85a6

3 years agoEnum-ify stack/include/avdt_api::tAVDT_RESULT am: 204e013fde
Chris Manton [Tue, 16 Feb 2021 22:00:52 +0000 (22:00 +0000)]
Enum-ify stack/include/avdt_api::tAVDT_RESULT am: 204e013fde

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63ceb12a39d2762593d6f7727382cedfe9991617

3 years agoRe-log l2c_link_hci_conn_comp am: 1dd70c4cc8
Chris Manton [Tue, 16 Feb 2021 22:00:05 +0000 (22:00 +0000)]
Re-log l2c_link_hci_conn_comp am: 1dd70c4cc8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1575229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icec59a0029bbceafc7b78520157601abbba2ebd8

3 years agobtaa: introduce btaa module into gd
Michael Sun [Mon, 23 Nov 2020 05:58:48 +0000 (05:58 +0000)]
btaa: introduce btaa module into gd

Introduce the btaa module skeleton implementation in gd.

Tag: #feature
Bug: 172501038
Test: mmma -j system/bt
Change-Id: I7fa28e8ef5eb25ff08b96ab7b43a2526359450f8

3 years agoWipe cache when HID report cache isn't compatible with the current cache version.
Johanna Ye [Tue, 16 Feb 2021 13:10:55 +0000 (14:10 +0100)]
Wipe cache when HID report cache isn't compatible with the current cache version.

This is to fix a big triggered by the OTA from any previous version to S
due to the structure change of the cache report entries.

Also corrected minor typos in documentation.

Tag: #stability
Test: Bond with HID device, upgrade from Q to S, verify device is
working.
Bug: 178874105
Bug: 159868059

Change-Id: Ibbd5da90892a637ffe8ff09b2b98bfc9fe3fb0cd

3 years agoFix test for googletest upgrade
Haibo Huang [Tue, 9 Feb 2021 18:47:25 +0000 (10:47 -0800)]
Fix test for googletest upgrade

bluetooth::hci::Address conflicts with testing::Address. Move the whole
test out of testing namespace.

Tag: refactor
Test: build
Change-Id: I6015c426a80e1f2aeed9a7aea4856dec5bd36d16

3 years agoRemove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init
Chris Manton [Thu, 11 Feb 2021 06:33:40 +0000 (22:33 -0800)]
Remove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init

Towards meaningful code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: Ib4e759a47e947de205f680d31b25c8bb10a1f252