Merge "BLE: fix doesn't unregister client_if since appDied flag is wrong" (c95b44ce) · Commits · e / os / android_packages_modules_Bluetooth

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -340,25 +340,25 @@ public class GattService extends ProfileService {
		Log.d(TAG, "Binder is dead - unregistering scanner (" + mScannerId + ")!");
		}

		if (isScanClient(mScannerId)) {
		ScanClient client = new ScanClient(mScannerId);
		ScanClient client = getScanClient(mScannerId);
		if (client != null) {
		client.appDied = true;
		stopScan(client.scannerId);
		}
		}

		private boolean isScanClient(int clientIf) {
		private ScanClient getScanClient(int clientIf) {
		for (ScanClient client : mScanManager.getRegularScanQueue()) {
		if (client.scannerId == clientIf) {
		return true;
		return client;
		}
		}
		for (ScanClient client : mScanManager.getBatchScanQueue()) {
		if (client.scannerId == clientIf) {
		return true;
		return client;
		}
		}
		return false;
		return null;
		}
		}