Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_packages_modules_Bluetooth
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

392399f3

Commit 392399f3 authored 4 years ago by Treehugger Robot Committed by Automerger Merge Worker 4 years ago

Downloads
- Plain Diff

Merge changes I9f667570,I056a3fdc,I685a3220,I81cdee3a,I7e053cff am: 9b0e46bd...

Merge changes I9f667570,I056a3fdc,I685a3220,I81cdee3a,I7e053cff am: 9b0e46bd am: 26adcf0c am: c8a825ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9bb17dc0fe55fa262e26fc1c35cbf0ae841e65a

parents 25aec006 c8a825ac

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

system/bta/dm/bta_dm_act.cc 2 additions, 2 deletions

system/bta/dm/bta_dm_act.cc
system/bta/gatt/bta_gattc_act.cc 2 additions, 2 deletions

system/bta/gatt/bta_gattc_act.cc
system/bta/include/bta_dm_acl.h 2 additions, 1 deletion

system/bta/include/bta_dm_acl.h
system/bta/sys/bta_sys.h 2 additions, 1 deletion

system/bta/sys/bta_sys.h
system/bta/sys/bta_sys_conn.cc 1 addition, 1 deletion

system/bta/sys/bta_sys_conn.cc
system/gd/hci/acl_manager/classic_impl.h 5 additions, 4 deletions

system/gd/hci/acl_manager/classic_impl.h
system/main/shim/l2c_api.cc 3 additions, 2 deletions

system/main/shim/l2c_api.cc
system/stack/acl/btm_acl.cc 11 additions, 7 deletions

system/stack/acl/btm_acl.cc
system/stack/btm/btm_ble_gap.cc 1 addition, 1 deletion

system/stack/btm/btm_ble_gap.cc
system/stack/btm/btm_sco.cc 2 additions, 2 deletions

system/stack/btm/btm_sco.cc
system/stack/btm/btm_sec.cc 4 additions, 4 deletions

system/stack/btm/btm_sec.cc
system/stack/include/gatt_api.h 23 additions, 0 deletions

system/stack/include/gatt_api.h
system/stack/include/hci_error_code.h 15 additions, 4 deletions

system/stack/include/hci_error_code.h
system/stack/include/sco_hci_link_interface.h 2 additions, 1 deletion

system/stack/include/sco_hci_link_interface.h
system/stack/test/common/mock_bta_dm_act.cc 1 addition, 1 deletion

system/stack/test/common/mock_bta_dm_act.cc
system/stack/test/common/mock_bta_sys_conn.cc 1 addition, 1 deletion

system/stack/test/common/mock_bta_sys_conn.cc

with 77 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment