Merge "Bluetooth: remove suspended scan client when app calls stopScan" (e1146202) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/ScanManager.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,9 @@ public class ScanManager {
		if (client == null) {
		client = mScanNative.getRegularScanClient(scannerId);
		}
		if (client == null) {
		client = mScanNative.getSuspendedScanClient(scannerId);
		}
		sendMessage(MSG_STOP_BLE_SCAN, client);
		}

		@@ -1273,6 +1276,15 @@ public class ScanManager {
		return null;
		}

		ScanClient getSuspendedScanClient(int scannerId) {
		for (ScanClient client : mSuspendedScanClients) {
		if (client.scannerId == scannerId) {
		return client;
		}
		}
		return null;
		}

		void stopBatchScan(ScanClient client) {
		mBatchClients.remove(client);
		removeScanFilters(client.scannerId);