Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 am: 57a4676876 (c88bc262) · Commits · e / os / android_frameworks_base

core/java/android/companion/BluetoothDeviceFilter.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,16 @@ public final class BluetoothDeviceFilter implements DeviceFilter<BluetoothDevice
		return Objects.hash(mNamePattern, mAddress, mServiceUuids, mServiceUuidMasks);
		}

		@Override
		public String toString() {
		return "BluetoothDeviceFilter{"
		+ "mNamePattern=" + mNamePattern
		+ ", mAddress='" + mAddress + '\''
		+ ", mServiceUuids=" + mServiceUuids
		+ ", mServiceUuidMasks=" + mServiceUuidMasks
		+ '}';
		}

		@Override
		public int describeContents() {
		return 0;

+11 −10

Original line number	Diff line number	Diff line
		@@ -259,18 +259,19 @@ public class DeviceDiscoveryService extends Service {
		private void onDeviceFound(@Nullable DeviceFilterPair device) {
		if (device == null) return;

		if (mDevicesFound.contains(device)) {
		return;
		}

		if (DEBUG) Log.i(LOG_TAG, "Found device " + device);

		Handler.getMain().sendMessage(obtainMessage(
		DeviceDiscoveryService::onDeviceFoundMainThread, this, device));
		}

		@MainThread
		void onDeviceFoundMainThread(@NonNull DeviceFilterPair device) {
		if (mDevicesFound.contains(device)) {
		Log.i(LOG_TAG, "Skipping device " + device + " - already among found devices");
		return;
		}

		Log.i(LOG_TAG, "Found device " + device);

		if (mDevicesFound.isEmpty()) {
		onReadyToShowUI();
		}
		@@ -432,10 +433,10 @@ public class DeviceDiscoveryService extends Service {

		@Override
		public String toString() {
		return "DeviceFilterPair{" +
		"device=" + device +
		", filter=" + filter +
		'}';
		return "DeviceFilterPair{"
		+ "device=" + device + " " + getDisplayName()
		+ ", filter=" + filter
		+ '}';
		}
		}