commit 1e0bf3a7e33eb6c653e5bc88f12652b331562b69
author Zach Johnson <zachoverflow@google.com> Thu Mar 16 00:50:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 16 00:50:19 2017 +0000
tree 460f19e87b1a5d7c03238f876057a288ef8be0b6
parent 222cf72efa78ce79c0f0adc499965e21979321be
parent eff4007fb5c79a0a8c708e5ace94eba38061cb96

Merge "Fix MCT data transport for the BT HAL" am: a8dce86cd8 am: 346ee4e2c8
am: eff4007fb5

Change-Id: Id2542183f2de78fd2c2ebb2458f5dc98b6353ed2

bluetooth/1.0/default/vendor_interface.cc

diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index 26f52f7..e6575b0 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -248,10 +248,9 @@
         new hci::MctProtocol(fd_list, intercept_events, acl_cb);
     fd_watcher_.WatchFdForNonBlockingReads(
         fd_list[CH_EVT], [mct_hci](int fd) { mct_hci->OnEventDataReady(fd); });
-    if (fd_count >= CH_ACL_IN)
-      fd_watcher_.WatchFdForNonBlockingReads(
-          fd_list[CH_ACL_IN],
-          [mct_hci](int fd) { mct_hci->OnAclDataReady(fd); });
+    fd_watcher_.WatchFdForNonBlockingReads(
+        fd_list[CH_ACL_IN],
+        [mct_hci](int fd) { mct_hci->OnAclDataReady(fd); });
     hci_ = mct_hci;
   }