Merge "Ensure LE scan clients are removed when the related app dies" (c4bc0b68) · Commits · e / os / android_packages_apps_Bluetooth

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -263,10 +263,6 @@ public class ScanManager {
		if (client == null) return;

		if (mRegularScanClients.contains(client)) {
		// The ScanClient passed in just holds the clientIf. We retrieve the real client,
		// which may have workSource set.
		client = mScanNative.getRegularScanClient(client.clientIf);
		if (client == null) return;

		mScanNative.stopRegularScan(client);

		@@ -280,7 +276,11 @@ public class ScanManager {

		// Update BatteryStats with this workload.
		try {
		mBatteryStats.noteBleScanStopped(client.workSource);
		// The ScanClient passed in just holds the clientIf. We retrieve the real client,
		// which may have workSource set.
		ScanClient workClient = mScanNative.getRegularScanClient(client.clientIf);
		if (workClient != null)
		mBatteryStats.noteBleScanStopped(workClient.workSource);
		} catch (RemoteException e) {
		/* ignore */
		}