commit d8dc4f3a931919342c968d726a4db2a09e67b7a2
author Greg Kaiser <gkaiser@google.com> Thu Feb 27 06:31:05 2020 -0800
committer Greg Kaiser <gkaiser@google.com> Thu Feb 27 06:31:05 2020 -0800
tree 010525eb9449d781ca8b09672a0eb5085a526557
parent 3f1d0d42052eb4ac42634a5b900d33ebdd3ff9a0

Fix logic bug in shim

We want to check the BLE mask constant against the device_type
variable.  Checking the make constant against itself was always
true.

Test: TreeHugger
Change-Id: Ifb157a4779b40210c3340439c2a6da30e276aa6a

system/main/shim/btm.cc

diff --git a/system/main/shim/btm.cc b/system/main/shim/btm.cc
index 0c4969a..20d9a85 100644
--- a/system/main/shim/btm.cc
+++ b/system/main/shim/btm.cc
@@ -792,7 +792,7 @@
                                              tBT_TRANSPORT transport,
                                              int device_type) {
   if (transport == BTA_TRANSPORT_UNKNOWN) {
-    if (BT_DEVICE_TYPE_BLE & BT_DEVICE_TYPE_BLE) {
+    if (device_type & BT_DEVICE_TYPE_BLE) {
       transport = BTA_TRANSPORT_LE;
     } else if (device_type & BT_DEVICE_TYPE_BREDR) {
       transport = BTA_TRANSPORT_BR_EDR;
@@ -829,4 +829,4 @@
       bluetooth::shim::GetSecurityModule()->GetSecurityManager();
   security_manager->RemoveBond(ToAddressWithType(bd_addr, BLE_ADDR_PUBLIC));
   return true;
-}
\ No newline at end of file
+}