OSDN Git Service

android-x86/system-bt.git
3 years agosmp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5 am: d76494...
Myles Watson [Fri, 5 Mar 2021 00:46:38 +0000 (00:46 +0000)]
smp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5 am: d7649413ad am: d501a765c9 am: a58ff17c3f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic47fa3b5cd43a2b523fa18af751e4d15ef36bd5b

3 years agoMerge "resolve merge conflicts of c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc...
Myles Watson [Thu, 4 Mar 2021 23:52:20 +0000 (23:52 +0000)]
Merge "resolve merge conflicts of c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp

3 years agoMerge "RootCanal: Disable LeExtendedAdvertising" am: e862a44ff4 am: 742c33e81e
Myles Watson [Thu, 4 Mar 2021 04:21:53 +0000 (04:21 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising" am: e862a44ff4 am: 742c33e81e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e6e8f4fe62222f409a2006fa8dd4907e27b0fed

3 years agoMerge "RootCanal: Disable LeExtendedAdvertising" am: e862a44ff4
Myles Watson [Thu, 4 Mar 2021 02:40:45 +0000 (02:40 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising" am: e862a44ff4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e05c4114e21d87302e0d2d7277ef358dc01108f

3 years agoresolve merge conflicts of c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev...
Myles Watson [Thu, 4 Mar 2021 01:40:01 +0000 (01:40 +0000)]
resolve merge conflicts of c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev-plus-aosp

Change-Id: I0df2ad9ed138414bfc4551ec175e086cf7c112a7

3 years agoMerge "RootCanal: Disable LeExtendedAdvertising"
Myles Watson [Thu, 4 Mar 2021 01:20:12 +0000 (01:20 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising"

3 years agoRootCanal: Disable LeExtendedAdvertising
Myles Watson [Wed, 3 Mar 2021 23:23:33 +0000 (15:23 -0800)]
RootCanal: Disable LeExtendedAdvertising

Bug: 181783722
Test: cert/run
Tag: #gd-refactor
Change-Id: I1e687b9177211385f62aff39db59c312db3c8c4a

3 years ago[automerger skipped] Merge "Merge RQ2A.210305.007" am: 4ad3a2452a -s ours am: ea2ec38...
Xin Li [Wed, 3 Mar 2021 23:36:58 +0000 (23:36 +0000)]
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 4ad3a2452a -s ours am: ea2ec388c5 -s ours

am skip reason: Change-Id I70d48f04611d3bd380b8e29d21e590e69c6bfe0c with SHA-1 a74d9d71fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa0822a69cc3068ee2ace7652955f185dc666c51

3 years ago[automerger skipped] Merge "Merge RQ2A.210305.007" am: 4ad3a2452a -s ours
Xin Li [Wed, 3 Mar 2021 22:28:29 +0000 (22:28 +0000)]
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 4ad3a2452a -s ours

am skip reason: Change-Id I70d48f04611d3bd380b8e29d21e590e69c6bfe0c with SHA-1 a74d9d71fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6067ee165f3933a9908fc41506602a7aa4d09534

3 years agosmp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5 am: d76494...
Myles Watson [Wed, 3 Mar 2021 22:00:17 +0000 (22:00 +0000)]
smp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5 am: d7649413ad am: d501a765c9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b1c8452941716de72db6f8b54ed054c3002216b

3 years agoMerge "Merge RQ2A.210305.007"
Xin Li [Wed, 3 Mar 2021 21:41:36 +0000 (21:41 +0000)]
Merge "Merge RQ2A.210305.007"

3 years agosmp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5 am: d7649413ad
Myles Watson [Wed, 3 Mar 2021 20:53:19 +0000 (20:53 +0000)]
smp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5 am: d7649413ad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd61aee4801775b302e5e5eade5c7010228b8566

3 years agosmp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5
Myles Watson [Wed, 3 Mar 2021 20:15:44 +0000 (20:15 +0000)]
smp: Reject pairing if the public keys match am: b7e176df4b am: 384a93f2b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6945ff206f775739e76ee63b66bfe9acdd0c2c9a

3 years agosmp: Reject pairing if the public keys match am: b7e176df4b
Myles Watson [Wed, 3 Mar 2021 19:08:40 +0000 (19:08 +0000)]
smp: Reject pairing if the public keys match am: b7e176df4b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If45c76319ea662f40ce02bc8ef9f8d6e2ce9d291

3 years agoMerge RQ2A.210305.007
Xin Li [Tue, 2 Mar 2021 23:49:59 +0000 (15:49 -0800)]
Merge RQ2A.210305.007

Bug: 180401296
Merged-In: I70d48f04611d3bd380b8e29d21e590e69c6bfe0c
Change-Id: If5621cce571c1e580be6a7949f945318482146aa

3 years agoMerge "btif: Return after closing the socket" into qt-dev am: f77ee94322 am: 656e9885...
TreeHugger Robot [Wed, 3 Mar 2021 02:59:02 +0000 (02:59 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am: f77ee94322 am: 656e98853c am: bc52d62a13

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee3bb154833c4d4ae979f31271dc10b82f96f806

3 years agoMerge "btif: Return after closing the socket" into qt-dev am: f77ee94322 am: 656e98853c
TreeHugger Robot [Wed, 3 Mar 2021 02:16:18 +0000 (02:16 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am: f77ee94322 am: 656e98853c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4551137fac7bff57f27bbdf210d329b058022ea2

3 years agoMerge "btif: Return after closing the socket" into qt-dev am: f77ee94322
TreeHugger Robot [Wed, 3 Mar 2021 01:34:32 +0000 (01:34 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am: f77ee94322

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6f1e224a54b4c8b4ea5618d307e8cad56c64bca

3 years agoRootCanal: Send LeReadRemoteFeatures to LE address am: 5420443c00 am: 901c3e2052
Myles Watson [Wed, 3 Mar 2021 00:54:22 +0000 (00:54 +0000)]
RootCanal: Send LeReadRemoteFeatures to LE address am: 5420443c00 am: 901c3e2052

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6de905e2d03d57dc89cd505f7db4a71ea9030239

3 years agoFix discover service process using wrong transport am: 54c556ed8a am: ee0fddd576
cheng_cai [Wed, 3 Mar 2021 00:54:17 +0000 (00:54 +0000)]
Fix discover service process using wrong transport am: 54c556ed8a am: ee0fddd576

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I760f45ed06979cb56c39f81ab2b41259e90062dc

3 years agoMerge "btif: Return after closing the socket" into qt-dev
TreeHugger Robot [Wed, 3 Mar 2021 00:51:13 +0000 (00:51 +0000)]
Merge "btif: Return after closing the socket" into qt-dev

3 years agoRootCanal: Send LeReadRemoteFeatures to LE address am: 5420443c00
Myles Watson [Wed, 3 Mar 2021 00:16:07 +0000 (00:16 +0000)]
RootCanal: Send LeReadRemoteFeatures to LE address am: 5420443c00

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb83b765df8949b0f2bd0d8bda12eb82079eff26

3 years agoFix discover service process using wrong transport am: 54c556ed8a
cheng_cai [Wed, 3 Mar 2021 00:11:56 +0000 (00:11 +0000)]
Fix discover service process using wrong transport am: 54c556ed8a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5df1d9a974f344474f4a52ac247d48ab4a7a4ffc

3 years agoMerge "Shim Scanning: Update device property" am: b2613c875f am: a74d9d71fe
Treehugger Robot [Tue, 2 Mar 2021 23:01:01 +0000 (23:01 +0000)]
Merge "Shim Scanning: Update device property" am: b2613c875f am: a74d9d71fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic087bddf91d8dedd8eefb4ac6d73e5f31e398c26

3 years agoRootCanal: Send LeReadRemoteFeatures to LE address
Myles Watson [Tue, 2 Mar 2021 21:46:14 +0000 (13:46 -0800)]
RootCanal: Send LeReadRemoteFeatures to LE address

Bug: 181371297
Test: cert/run DirectHciTest
Tag: #gd-refactor
Change-Id: I8b795c2bb440f98fc840a837e2ab27ef35811558

3 years agoMerge "Shim Scanning: Update device property" am: b2613c875f
Treehugger Robot [Tue, 2 Mar 2021 22:09:33 +0000 (22:09 +0000)]
Merge "Shim Scanning: Update device property" am: b2613c875f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70d48f04611d3bd380b8e29d21e590e69c6bfe0c

3 years agoMerge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ... am: 8bc9c37d89...
Chris Manton [Tue, 2 Mar 2021 21:50:55 +0000 (21:50 +0000)]
Merge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ... am: 8bc9c37d89 am: 0c2f9c3514

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104e4122720d31f5e5ab3db3890e9e7a234ffad5

3 years agoMerge "RootCanal: Report actual supported commands" am: e0f6c7a008 am: d55f0ad738
Myles Watson [Tue, 2 Mar 2021 21:50:16 +0000 (21:50 +0000)]
Merge "RootCanal: Report actual supported commands" am: e0f6c7a008 am: d55f0ad738

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6084e2230db9607c624f13f072c345e73f373f73

3 years agoMerge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ... am: 8bc9c37d89
Chris Manton [Tue, 2 Mar 2021 21:36:52 +0000 (21:36 +0000)]
Merge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ... am: 8bc9c37d89

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1763a715405459240aa443c8ae39fcffe747e374

3 years agoMerge "RootCanal: Report actual supported commands" am: e0f6c7a008
Myles Watson [Tue, 2 Mar 2021 21:27:45 +0000 (21:27 +0000)]
Merge "RootCanal: Report actual supported commands" am: e0f6c7a008

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00bba233a0a92cd21a86f67d2dd7ca5bcbb4ef36

3 years agoFix discover service process using wrong transport
cheng_cai [Fri, 17 Apr 2020 12:12:25 +0000 (20:12 +0800)]
Fix discover service process using wrong transport

Application may use createBond by transport API to bond with a dual mode
device. If the stack doesn’t get a name from the adv packet, the
stack will start to discover remote name before discovering remote
service. As stack will clear the bta_dm_search_cb.transport flag after
searching remote name, the sdp protocol will be used to discover remote
services, but actually it should use gatt protocol.

Bug: 154299225
Test: Create bond with a dual mode device using le transport
Tag: #compatibility
Sponsor: optedoblivion@
Change-Id: I05b9fa9cf9801cf681e195d490d77d61f77e43a3

3 years agoAdd host support for audio_hal_interface/ am: 0435ab0c27 am: 65066e2c43
Hansong Zhang [Tue, 2 Mar 2021 20:41:24 +0000 (20:41 +0000)]
Add host support for audio_hal_interface/ am: 0435ab0c27 am: 65066e2c43

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I626738ee077f17d04406c73a18a2f440a4ff387e

3 years agoBluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1 am: 6315e27778 am...
Grzegorz Kołodziejczyk [Tue, 2 Mar 2021 20:34:57 +0000 (20:34 +0000)]
BluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1 am: 6315e27778 am: 8d7ad23ea1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8075e0325832cb7d5fe7d531e8c0b6758204159

3 years agoMerge "Shim Scanning: Update device property"
Treehugger Robot [Tue, 2 Mar 2021 20:34:38 +0000 (20:34 +0000)]
Merge "Shim Scanning: Update device property"

3 years agoMerge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ...
Chris Manton [Tue, 2 Mar 2021 20:26:56 +0000 (20:26 +0000)]
Merge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ...

* changes:
  Use API ignore_auto_connect_after_disconnect
  Add API ignore_auto_connect_after_disconnect
  Streamline stack/btm/btm_sec::btm_sec_disconnected
  Streamline stack/btm/btm_sec::btm_sec_send_hci_disconnect
  Stat-ify bta/hh/bta_hh_le::bta_hh_le_deregister_input_notif
  Streamline bta/hh/bta_hh_le::bta_hh_le_remove_dev_bg_conn
  Streamline bta/hh/bta_hh_le::bta_hh_gatt_close
  Streamline bta/gatt/bta_gattc_act::bta_gattc_process_api_open_cancel
  Streamline stack/hid/hidh_conn::hidh_conn_disconnect
  Streamline stack/hid/hidh_conn::hidh_l2cif_disconnect
  Canonicalize stack/hid/hidh_conn.cc
  Streamline bta/hh/bta_hh_act::bta_hh_api_disc_act
  Remove unnecessary declarations btif/src/btif_hh
  Streamline btif/src/btif_hh::btif_hh_disconnect
  Add le acceptlist size to dumpsys
  Remove unnecessary #def guard bta/hh/bta_hh_main::BTA_HH_DEBUG
  Explicitly name stack/acl::tACL_CONN
  Enum-ify stack/include/hiddefs::tHID_STATUS

3 years agoAdd host support for audio_hal_interface/ am: 0435ab0c27
Hansong Zhang [Tue, 2 Mar 2021 20:09:51 +0000 (20:09 +0000)]
Add host support for audio_hal_interface/ am: 0435ab0c27

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5bd05c3f8cb4c4786f416ac12fa13f303b52bb4

3 years agoBluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1 am: 6315e27778
Grzegorz Kołodziejczyk [Tue, 2 Mar 2021 20:05:50 +0000 (20:05 +0000)]
BluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1 am: 6315e27778

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0b5391c74078e2c9407b49b59c41374356c5531

3 years agoPull up ACL_AcceptLeConnectionFrom stack am: 7252648c47 am: 07615c4791
Chris Manton [Tue, 2 Mar 2021 19:50:07 +0000 (19:50 +0000)]
Pull up ACL_AcceptLeConnectionFrom stack am: 7252648c47 am: 07615c4791

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5d473d8bdad98162f4dec1f2dd565d7ed926815

3 years agoPull up ACL_AcceptLeConnectionFrom stack am: 7252648c47
Chris Manton [Tue, 2 Mar 2021 19:02:43 +0000 (19:02 +0000)]
Pull up ACL_AcceptLeConnectionFrom stack am: 7252648c47

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d9ecde706384c0111156cf6d22aafb73101ef5b

3 years agoMerge "RootCanal: Report actual supported commands"
Myles Watson [Tue, 2 Mar 2021 19:00:33 +0000 (19:00 +0000)]
Merge "RootCanal: Report actual supported commands"

3 years agoMerge "HFPClient: HF Indicators support" am: d546e7ef9d am: 85885e59d0
Treehugger Robot [Tue, 2 Mar 2021 18:46:51 +0000 (18:46 +0000)]
Merge "HFPClient: HF Indicators support" am: d546e7ef9d am: 85885e59d0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id984e5df8c5f655cae6142c8843ea8093bd363be

3 years agoMerge "export async_fd_watcher" am: 96665b0602 am: 6c67f961f8
Treehugger Robot [Tue, 2 Mar 2021 18:46:17 +0000 (18:46 +0000)]
Merge "export async_fd_watcher" am: 96665b0602 am: 6c67f961f8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I077700c4861751ad849507ce9ab5792c93a75276

3 years agoMerge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: fa84b60443
TreeHugger Robot [Tue, 2 Mar 2021 18:44:21 +0000 (18:44 +0000)]
Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: fa84b60443

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I640059a6ca8546a0c29f53855ecd9ec8de7656f8

3 years agoAdd host support for audio_hal_interface/
Hansong Zhang [Tue, 2 Mar 2021 01:46:12 +0000 (17:46 -0800)]
Add host support for audio_hal_interface/

Bug: 181590011
Tag: #refactor
Test: compile
Change-Id: Ic47d789dacabc2089f8d63bf9ab67cb480d1d6b7

3 years agoUse API ignore_auto_connect_after_disconnect
Chris Manton [Sat, 27 Feb 2021 17:20:48 +0000 (09:20 -0800)]
Use API ignore_auto_connect_after_disconnect

Bug: 180781174
Test: cert
Tag: #refactor

Change-Id: Ia032262c0e136ea7bc7b7bd7a2737b7d67439804

3 years agoAdd API ignore_auto_connect_after_disconnect
Chris Manton [Sat, 27 Feb 2021 17:19:55 +0000 (09:19 -0800)]
Add API ignore_auto_connect_after_disconnect

Bug: 180781174
Test: cert
Tag: #refactor

Change-Id: Ic587965e57c87174cb39bd0b79321c22842dbbad

3 years agoStreamline stack/btm/btm_sec::btm_sec_disconnected
Chris Manton [Fri, 26 Feb 2021 20:46:17 +0000 (12:46 -0800)]
Streamline stack/btm/btm_sec::btm_sec_disconnected

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I6dc0fcecc9abd8e29fafa1c60a92c471d394f49c

3 years agoStreamline stack/btm/btm_sec::btm_sec_send_hci_disconnect
Chris Manton [Fri, 26 Feb 2021 18:08:40 +0000 (10:08 -0800)]
Streamline stack/btm/btm_sec::btm_sec_send_hci_disconnect

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I51913698328be8eaf096de890c558162d39e8cb2

3 years agoStat-ify bta/hh/bta_hh_le::bta_hh_le_deregister_input_notif
Chris Manton [Fri, 26 Feb 2021 18:08:27 +0000 (10:08 -0800)]
Stat-ify bta/hh/bta_hh_le::bta_hh_le_deregister_input_notif

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I17a8ef4f1794f23760cf480c161d82b621bbde46

3 years agoStreamline bta/hh/bta_hh_le::bta_hh_le_remove_dev_bg_conn
Chris Manton [Fri, 26 Feb 2021 03:16:37 +0000 (19:16 -0800)]
Streamline bta/hh/bta_hh_le::bta_hh_le_remove_dev_bg_conn

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I7e7fe917cbf8b4695f2c209ace1bc0783e5adef9

3 years agoStreamline bta/hh/bta_hh_le::bta_hh_gatt_close
Chris Manton [Fri, 26 Feb 2021 03:16:26 +0000 (19:16 -0800)]
Streamline bta/hh/bta_hh_le::bta_hh_gatt_close

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I02e2cd2064b387d42269b08fd178c74222cbf2d3

3 years agoStreamline bta/gatt/bta_gattc_act::bta_gattc_process_api_open_cancel
Chris Manton [Fri, 26 Feb 2021 03:15:54 +0000 (19:15 -0800)]
Streamline bta/gatt/bta_gattc_act::bta_gattc_process_api_open_cancel

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I7dbfd0e27fee14ad0161fbe96b6f4a9412503cbb

3 years agoStreamline stack/hid/hidh_conn::hidh_conn_disconnect
Chris Manton [Fri, 26 Feb 2021 03:02:54 +0000 (19:02 -0800)]
Streamline stack/hid/hidh_conn::hidh_conn_disconnect

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I9cec9a720ef56e5e73f5830884dcd12abdc875fb

3 years agoStreamline stack/hid/hidh_conn::hidh_l2cif_disconnect
Chris Manton [Fri, 26 Feb 2021 03:02:40 +0000 (19:02 -0800)]
Streamline stack/hid/hidh_conn::hidh_l2cif_disconnect

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I5ee1f8e3f3ec1c1783dab96bd27693721608fdf2

3 years agoCanonicalize stack/hid/hidh_conn.cc
Chris Manton [Fri, 26 Feb 2021 02:53:38 +0000 (18:53 -0800)]
Canonicalize stack/hid/hidh_conn.cc

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I9e233853056f4694d484212c9252fb3e0e9ab41b

3 years agoStreamline bta/hh/bta_hh_act::bta_hh_api_disc_act
Chris Manton [Fri, 26 Feb 2021 02:31:51 +0000 (18:31 -0800)]
Streamline bta/hh/bta_hh_act::bta_hh_api_disc_act

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I7fca94e52935f0280e1e03d869a4711d7d843aab

3 years agoRemove unnecessary declarations btif/src/btif_hh
Chris Manton [Fri, 26 Feb 2021 21:01:31 +0000 (13:01 -0800)]
Remove unnecessary declarations btif/src/btif_hh

And unused #defs

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ia1ff2588ee93c7df4f913dafb8a7ff8af31923a8

3 years agoStreamline btif/src/btif_hh::btif_hh_disconnect
Chris Manton [Fri, 26 Feb 2021 02:04:39 +0000 (18:04 -0800)]
Streamline btif/src/btif_hh::btif_hh_disconnect

And remove unused #defs

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I0842b2c97e08e1c29138f6c5cf9eecbd061a296b

3 years agoAdd le acceptlist size to dumpsys
Chris Manton [Sat, 27 Feb 2021 00:29:30 +0000 (16:29 -0800)]
Add le acceptlist size to dumpsys

Bug: 180781174
Test: cert
Tag: #refactor

Change-Id: I5473b335da078b21b8e9cebf06c21da150473dd2

3 years agoRemove unnecessary #def guard bta/hh/bta_hh_main::BTA_HH_DEBUG
Chris Manton [Fri, 26 Feb 2021 02:04:27 +0000 (18:04 -0800)]
Remove unnecessary #def guard bta/hh/bta_hh_main::BTA_HH_DEBUG

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I3c36cac4e582ff83e4ffe5a116c0dc0d750d3ea7

3 years agoExplicitly name stack/acl::tACL_CONN
Chris Manton [Fri, 26 Feb 2021 23:12:03 +0000 (15:12 -0800)]
Explicitly name stack/acl::tACL_CONN

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Id7b934e9676e356d5f5580398c0268b42f557778

3 years agoEnum-ify stack/include/hiddefs::tHID_STATUS
Chris Manton [Fri, 26 Feb 2021 02:39:13 +0000 (18:39 -0800)]
Enum-ify stack/include/hiddefs::tHID_STATUS

Also add tHID_STATUS::_text and CASE_RETURN_TEXT cleanup

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I3f9189f01907ef9e6e7253a5d1b4a2a55534d05c

3 years agoShim Scanning: Update device property
Chienyuan [Tue, 2 Mar 2021 09:29:48 +0000 (17:29 +0800)]
Shim Scanning: Update device property

Tag: #gd-refactor
Bug: 181078056
Test: gd/cert/run
Test: manual, pair fitbit watch vai fitbit app

Change-Id: I4c5873bd0bf4727b9c455b11a0a4dca5d850288c

3 years agoBluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1
Grzegorz Kołodziejczyk [Thu, 25 Feb 2021 17:11:15 +0000 (17:11 +0000)]
BluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1

Single instance of mutex is used for getting all Providers Factories.
Calling GetProvidersFactory 2.0 but having 2.1 instance can cause dead
lock scenario.

Bug: 173538746
Tag: #feature
Test: start Bluetooth with set vinf ProvidersFactory set to 2.1
Sponsor: jpawlowski@
Change-Id: I642adb779391196296dfe8db2a352ebdcf711070

3 years agoPull up ACL_AcceptLeConnectionFrom stack
Chris Manton [Fri, 26 Feb 2021 20:43:12 +0000 (12:43 -0800)]
Pull up ACL_AcceptLeConnectionFrom stack

A more appropriate stack level for this conditional

Bug: 180781174
Test: cert
Tag: #refactor

Change-Id: I3dd5ad22d96a5ac785b63ce28351631c0b1a9537

3 years agoMerge "HFPClient: HF Indicators support" am: d546e7ef9d
Treehugger Robot [Tue, 2 Mar 2021 04:08:50 +0000 (04:08 +0000)]
Merge "HFPClient: HF Indicators support" am: d546e7ef9d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie87b5cb0bfcb6370020e9ef8b2bc49f24af3ee1e

3 years agoMerge "export async_fd_watcher" am: 96665b0602
Treehugger Robot [Tue, 2 Mar 2021 04:07:53 +0000 (04:07 +0000)]
Merge "export async_fd_watcher" am: 96665b0602

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f6d5575c304402f35437679cf7a0ddc6760cd7

3 years agoMerge "HFPClient: HF Indicators support"
Treehugger Robot [Tue, 2 Mar 2021 03:56:14 +0000 (03:56 +0000)]
Merge "HFPClient: HF Indicators support"

3 years agoMerge "export async_fd_watcher"
Treehugger Robot [Tue, 2 Mar 2021 03:21:14 +0000 (03:21 +0000)]
Merge "export async_fd_watcher"

3 years agoAdd host support for btif/ am: 58accc1b51 am: c298c72189
Hansong Zhang [Tue, 2 Mar 2021 02:04:47 +0000 (02:04 +0000)]
Add host support for btif/ am: 58accc1b51 am: c298c72189

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c43e1ba62fe443193a17e7d42aed72c8591742f

3 years agoMerge "Merge RQ2A.210305.007 into stage." into stage-aosp-master
TreeHugger Robot [Tue, 2 Mar 2021 01:09:13 +0000 (01:09 +0000)]
Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master

3 years agoAdd host support for btif/ am: 58accc1b51
Hansong Zhang [Tue, 2 Mar 2021 01:07:46 +0000 (01:07 +0000)]
Add host support for btif/ am: 58accc1b51

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9aeabd3e816e188163531ae17f21ce401a11365

3 years agoMerge "Remove additional handle mapping between C++ and Python" am: 94b1656518 am...
Treehugger Robot [Tue, 2 Mar 2021 00:12:04 +0000 (00:12 +0000)]
Merge "Remove additional handle mapping between C++ and Python" am: 94b1656518 am: 2570b8d21f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic778f9f4b5c81f0f815300075dcbc8e063e50654

3 years agoAdd host support for btif/
Hansong Zhang [Mon, 1 Mar 2021 20:55:37 +0000 (12:55 -0800)]
Add host support for btif/

Move some dependencies to Android only.

Bug: 181590011
Tag: #refactor
Test: compile
Change-Id: I37812378210e822d1d36fcf24aaadbcf9f4a5084

3 years agoMerge "Remove additional handle mapping between C++ and Python" am: 94b1656518
Treehugger Robot [Mon, 1 Mar 2021 23:26:41 +0000 (23:26 +0000)]
Merge "Remove additional handle mapping between C++ and Python" am: 94b1656518

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b491223760aa702ef87cf507113da27be3c4de7

3 years agoMerge "Remove additional handle mapping between C++ and Python"
Treehugger Robot [Mon, 1 Mar 2021 22:58:55 +0000 (22:58 +0000)]
Merge "Remove additional handle mapping between C++ and Python"

3 years agoMerge changes I0d082b14,I868d5eb4,I32c5931e am: f46a087a5d am: 50f144292a
Treehugger Robot [Mon, 1 Mar 2021 20:08:49 +0000 (20:08 +0000)]
Merge changes I0d082b14,I868d5eb4,I32c5931e am: f46a087a5d am: 50f144292a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I673580f04bb3a1591ae4f2da32df3daba6392f0a

3 years agohal: Add input port for bluetooth audio HAL am: 11b83404fa am: fcb2ca0269
Grzegorz Kołodziejczyk [Mon, 1 Mar 2021 20:08:44 +0000 (20:08 +0000)]
hal: Add input port for bluetooth audio HAL am: 11b83404fa am: fcb2ca0269

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I967be76e5ee8ffd826ab7899563a3608cdee3419

3 years agoRemove additional handle mapping between C++ and Python
Jakub Pawlowski [Mon, 1 Mar 2021 14:52:06 +0000 (15:52 +0100)]
Remove additional handle mapping between C++ and Python

We must be able to access ACL handle from upcoming ISO module.

Tag: #feature
Bug: 177907117
Test: cert/run LeL2capTest
Change-Id: I3124bff551930158ae80c43166dd9d95201ce6a2

3 years agoMerge changes I0d082b14,I868d5eb4,I32c5931e am: f46a087a5d
Treehugger Robot [Mon, 1 Mar 2021 19:48:23 +0000 (19:48 +0000)]
Merge changes I0d082b14,I868d5eb4,I32c5931e am: f46a087a5d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d6df2c0e3400bee9ef8e472a0c19a1cbbc27d13

3 years agoMerge changes I0d082b14,I868d5eb4,I32c5931e
Treehugger Robot [Mon, 1 Mar 2021 19:31:29 +0000 (19:31 +0000)]
Merge changes I0d082b14,I868d5eb4,I32c5931e

* changes:
  PyLeAclManager: Implement connection cancel
  RootCanal: Send ConnectionComplete after Cancel
  RootCanal: Disallow configuring ongoing scans

3 years agohal: Add input port for bluetooth audio HAL am: 11b83404fa
Grzegorz Kołodziejczyk [Mon, 1 Mar 2021 19:29:35 +0000 (19:29 +0000)]
hal: Add input port for bluetooth audio HAL am: 11b83404fa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06281bdd73cf7e876a2ff2e3ae9bd27279a99861

3 years agoRootCanal: Report actual supported commands
Myles Watson [Wed, 24 Feb 2021 15:52:02 +0000 (07:52 -0800)]
RootCanal: Report actual supported commands

Bug: 180860482
Test: cert/run
Tag: #root-canal
Change-Id: I2a856eccc6b5d1f3f9769ac635f1e163b12053d6

3 years agohal: Add input port for bluetooth audio HAL
Grzegorz Kołodziejczyk [Tue, 9 Feb 2021 14:48:25 +0000 (14:48 +0000)]
hal: Add input port for bluetooth audio HAL

Patch adds input port for bluetooth audio HAL.

Bug: 150670922
Tag: #feature
Test: atest bluetooth-test-audio-hal-interface
Sponsor: jpawlowski@
Change-Id: I7f9a12bcf13d7ce44f1f9a73d8b8a9bf4c764f92

3 years ago[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 60ce72f1b0...
Xin Li [Mon, 1 Mar 2021 09:26:11 +0000 (09:26 +0000)]
[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 60ce72f1b0 -s ours

am skip reason: Change-Id Iad6ec9f3b83feae19d631c5d0499da4ba5885f40 with SHA-1 17c4753709 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5009a68ac5210c3fb3e1541a9086dc506e516c1e

3 years agoMerge RQ2A.210305.007 into stage.
Xin Li [Mon, 1 Mar 2021 08:53:15 +0000 (00:53 -0800)]
Merge RQ2A.210305.007 into stage.

Bug: 180401296
Merged-In: I1d014a7b793bb1b66e26652f6696499ea36a6510
Change-Id: I026f7700ab9b9547ab06de795ed1b84a658368fd

3 years agoDO NOT MERGE - Mark RQ2A.210105.001 as merged.
Xin Li [Mon, 1 Mar 2021 08:43:24 +0000 (00:43 -0800)]
DO NOT MERGE - Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: Iad6ec9f3b83feae19d631c5d0499da4ba5885f40
Change-Id: I0756e13d93f10431ef56fce434c9da0cd9d43b5c

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt" am: a349f37dfd am: 17c4753709
Treehugger Robot [Mon, 1 Mar 2021 05:37:59 +0000 (05:37 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt" am: a349f37dfd am: 17c4753709

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4de166b5d5d6ba40b9eebf8d58f1e63cb4ca2810

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt" am: a349f37dfd
Treehugger Robot [Mon, 1 Mar 2021 04:59:39 +0000 (04:59 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt" am: a349f37dfd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad6ec9f3b83feae19d631c5d0499da4ba5885f40

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt"
Treehugger Robot [Mon, 1 Mar 2021 03:58:55 +0000 (03:58 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt"

3 years agoRemove unused AIDL API am: f7b2fad0d2 am: ca66a6bbe1
Hansong Zhang [Sun, 28 Feb 2021 23:07:13 +0000 (23:07 +0000)]
Remove unused AIDL API am: f7b2fad0d2 am: ca66a6bbe1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I874b2b379871473a74b371a553e4ba4b54b3b568

3 years agoAdd host support for bta/ am: 6aebf4c109 am: 22c6ea6906
Hansong Zhang [Sun, 28 Feb 2021 23:07:11 +0000 (23:07 +0000)]
Add host support for bta/ am: 6aebf4c109 am: 22c6ea6906

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief3763f8153d33e6bbdde682b0059e10d285e975

3 years agoAdd host support for udrv/ am: d480df840b am: 1bc5149095
Hansong Zhang [Sun, 28 Feb 2021 23:07:09 +0000 (23:07 +0000)]
Add host support for udrv/ am: d480df840b am: 1bc5149095

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie203269d4620dc61158f216fd15c0b227d2f39d7

3 years agoRemove unused AIDL API am: f7b2fad0d2
Hansong Zhang [Sun, 28 Feb 2021 22:12:57 +0000 (22:12 +0000)]
Remove unused AIDL API am: f7b2fad0d2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe12418f475a1afebdb42bf9a8032c731a3cb76e

3 years agoAdd host support for bta/ am: 6aebf4c109
Hansong Zhang [Sun, 28 Feb 2021 22:12:54 +0000 (22:12 +0000)]
Add host support for bta/ am: 6aebf4c109

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie21af17729a7119175990746e3c670f24f74dc35

3 years agoAdd host support for udrv/ am: d480df840b
Hansong Zhang [Sun, 28 Feb 2021 22:12:51 +0000 (22:12 +0000)]
Add host support for udrv/ am: d480df840b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b9f73e6b9d94ea857abf19406ab39dc25ba7d4d

3 years agoRemove unused AIDL API
Hansong Zhang [Fri, 26 Feb 2021 23:06:23 +0000 (15:06 -0800)]
Remove unused AIDL API

Test: compile
Change-Id: Ia7bfd2d6f8bbedc17b54e6d3c56581cb28945e0e

3 years agoAdd host support for bta/
Hansong Zhang [Tue, 23 Feb 2021 23:52:11 +0000 (15:52 -0800)]
Add host support for bta/

Test: compile
Change-Id: Ife3e7c386b4384907c1b39f921812c337becab52

3 years agoAdd host support for udrv/
Hansong Zhang [Thu, 25 Feb 2021 23:46:09 +0000 (15:46 -0800)]
Add host support for udrv/

Test: compile
Change-Id: I04394268d6259ccd08e5b5964cbcadb89209da91

3 years agoRe-include stack/gatt/gatt_utils am: 6509949af2 am: 70905fe696
Chris Manton [Sun, 28 Feb 2021 06:16:00 +0000 (06:16 +0000)]
Re-include stack/gatt/gatt_utils am: 6509949af2 am: 70905fe696

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I969731ceb9df83f663951893963744d2a7e34d1a