diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-30 00:07:13 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-30 00:07:13 +0000 |
| commit | 8d2ab799f2afe9aa65b0a4f44265040a5d9a883c (patch) | |
| tree | bd929929220b9161518c705feb8ea4d44bf9756b | |
| parent | ef1f6c676ef51da9720c84e4c06d07e60b727d52 (diff) | |
| parent | 71ecd2ebe5ebddcd6db0b5fdc44e3d9eaef17f2f (diff) | |
| download | bt-8d2ab799f2afe9aa65b0a4f44265040a5d9a883c.tar.gz | |
Merge cherrypicks of [12730462, 12730463, 12729574, 12730525, 12730638, 12730639, 12730640, 12730641, 12730642, 12730643, 12730564, 12730542, 12730526, 12730527, 12730543, 12729545, 12729634, 12730565, 12730531, 12730645, 12730545, 12730406] into rvc-d1-release
Change-Id: Ieec3761cbff416d1c073b5addc4d40fc781fe866
| -rw-r--r-- | stack/btm/btm_sec.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc index 63e4f6ce1..5d7d0f93b 100644 --- a/stack/btm/btm_sec.cc +++ b/stack/btm/btm_sec.cc @@ -4358,6 +4358,7 @@ void btm_sec_disconnected(uint16_t handle, uint8_t reason) { << p_dev_rec->bd_addr; bta_dm_remove_device(p_dev_rec->bd_addr); + return; } BTM_TRACE_EVENT("%s after update sec_flags=0x%x", __func__, |