From: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Date: Wed, 4 Dec 2019 08:13:37 +0000 (+0000)
Subject: Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b8530810808401cb2efb23ab985d03f8eca7455;p=android-x86%2Fsystem-bt.git

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9

Change-Id: I0767ba267fc51a926930288752a1a079414d5a76
---

5b8530810808401cb2efb23ab985d03f8eca7455
diff --cc stack/btm/btm_acl.cc
index 07a80fb06,d9720c7a7..34041d658
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@@ -44,9 -44,9 +44,10 @@@
  #include "btm_int.h"
  #include "btu.h"
  #include "device/include/controller.h"
 +#include "device/include/interop.h"
  #include "hcidefs.h"
  #include "hcimsgs.h"
+ #include "log/log.h"
  #include "l2c_int.h"
  #include "osi/include/osi.h"