Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c60d219 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into... 

Merge "[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into tm-dev am: 3003b6e3 am: 40fcf61a am: 22d429e3" into tm-qpr-dev-plus-aosp am: c768f950

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18475517



Change-Id: I72f6e8e1d8da56a8d3ed1885d183752a4f8fb817
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19044a6a c768f950

system/main/shim/le_scanning_manager.cc

+1 −2
Original line number Diff line number Diff line
@@ -148,8 +148,7 @@ void BleScannerInterfaceImpl::Unregister(int scanner_id) { 


  /** Start or stop LE device scanning */

void BleScannerInterfaceImpl::Scan(bool start) {

  LOG(INFO) << __func__ << " in shim layer "

            << ((start) ? "started" : "stopped");

  LOG(INFO) << __func__ << " in shim layer " <<  ((start) ? "started" : "stopped");

  bluetooth::shim::GetScanning()->Scan(start);

  BTM_LogHistory(

      kBtmLogTag, RawAddress::kEmpty,