Commit 6d3e56b5 authored May 19, 2022 by TreeHugger Robot Committed by Jack He May 19, 2022

[conflict] Merge "GD Scan: Update btm_cb.ble_ctr_cb when scan" into tm-dev am:...

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

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



Test: make
Change-Id: I9259ab3d4689514f91ca50b97b1cb7f2dccd26cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents e0bd0b72 22d429e3

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,