Merge c8523f5c9dfc0d3cf2f3ecc3c7f89326733fb276 on remote branch

Change-Id: Ibd4beb7c71dd436610071aff26ccde92e237dfbd

1 files changed, 6 insertions, 4 deletions

diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc
index 11a0f85eb6..991944a190 100644
--- a/system/stack/gatt/gatt_utils.cc
+++ b/system/stack/gatt/gatt_utils.cc
@@ -21,14 +21,16 @@
  *  this file contains GATT utility functions
  *
  ******************************************************************************/
+#define LOG_TAG "gatt_utils"
+
 #include <base/logging.h>
 #include <base/strings/stringprintf.h>
 
 #include <cstdint>
 
 #include "bt_target.h"  // Must be first to define build configuration
-#include "main/shim/shim.h"
 #include "osi/include/allocator.h"
+#include "osi/include/log.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/eatt/eatt.h"
 #include "stack/gatt/connection_manager.h"
@@ -257,7 +259,7 @@ bool gatt_find_the_connected_bda(uint8_t start_idx, RawAddress& bda,
                                  tBT_TRANSPORT* p_transport) {
   uint8_t i;
   bool found = false;
-  VLOG(1) << __func__ << " start_idx=" << +start_idx;
+  LOG_DEBUG("start_idx=%d", +start_idx);
 
   for (i = start_idx; i < GATT_MAX_PHY_CHANNEL; i++) {
     if (gatt_cb.tcb[i].in_use && gatt_cb.tcb[i].ch_state == GATT_CH_OPEN) {
@@ -265,11 +267,11 @@ bool gatt_find_the_connected_bda(uint8_t start_idx, RawAddress& bda,
       *p_found_idx = i;
       *p_transport = gatt_cb.tcb[i].transport;
       found = true;
-      VLOG(1) << " bda :" << bda;
+      LOG_DEBUG("bda: %s", bda.ToString().c_str());
       break;
     }
   }
-  VLOG(1) << StringPrintf(" found=%d found_idx=%d", found, i);
+  LOG_DEBUG("found=%d found_idx=%d", found, +i);
   return found;
 }