summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-15 07:26:24 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-15 07:26:24 +0000
commitff6208c4121dd6f14da465e3f5f4e0c30cd25d62 (patch)
treeaa03483c13dc9213149e53648c4a0352fb775ea4
parent36deb96b51e437d90510c3854db484a693adaeec (diff)
parentaad2686274783a229c8642db5fec4727c3ab292b (diff)
downloadandroid_system_bt-ff6208c4121dd6f14da465e3f5f4e0c30cd25d62.tar.gz
android_system_bt-ff6208c4121dd6f14da465e3f5f4e0c30cd25d62.tar.bz2
android_system_bt-ff6208c4121dd6f14da465e3f5f4e0c30cd25d62.zip
Snap for 4396223 from aad2686274783a229c8642db5fec4727c3ab292b to oc-mr1-release
Change-Id: I025c64d825a510806bd292a5555aedc594372284
-rw-r--r--stack/l2cap/l2c_ble.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/stack/l2cap/l2c_ble.cc b/stack/l2cap/l2c_ble.cc
index f611b7887..6c7820f66 100644
--- a/stack/l2cap/l2c_ble.cc
+++ b/stack/l2cap/l2c_ble.cc
@@ -447,6 +447,10 @@ void l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda,
static void l2cble_start_conn_update(tL2C_LCB* p_lcb) {
uint16_t min_conn_int, max_conn_int, slave_latency, supervision_tout;
tACL_CONN* p_acl_cb = btm_bda_to_acl(p_lcb->remote_bd_addr, BT_TRANSPORT_LE);
+ if (!p_acl_cb) {
+ LOG(ERROR) << "No known connection ACL for " << p_lcb->remote_bd_addr;
+ return;
+ }
// TODO(armansito): The return value of this call wasn't being used but the
// logic of this function might be depending on its side effects. We should