Merge "Scan LE audio hearing aids in HearingDevicePairingDetail" into udc-qpr-dev am: b598284c68

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726371

Change-Id: I4c4fcf33c3b64497ea5bc741ec4b8c839e9466cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Angela Wang
2023-07-21 03:22:21 +00:00
committed by Automerger Merge Worker

View File

@@ -28,7 +28,8 @@ import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothDevicePairingDetailBase; import com.android.settings.bluetooth.BluetoothDevicePairingDetailBase;
import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import java.util.Collections; import java.util.ArrayList;
import java.util.List;
/** /**
* HearingDevicePairingDetail is a page to scan hearing devices. This page shows scanning icons and * HearingDevicePairingDetail is a page to scan hearing devices. This page shows scanning icons and
@@ -42,10 +43,16 @@ public class HearingDevicePairingDetail extends BluetoothDevicePairingDetailBase
public HearingDevicePairingDetail() { public HearingDevicePairingDetail() {
super(); super();
final ScanFilter filter = new ScanFilter.Builder() final List<ScanFilter> filterList = new ArrayList<>();
.setServiceData(BluetoothUuid.HEARING_AID, new byte[]{0}, new byte[]{0}) // Filters for ASHA hearing aids
.build(); filterList.add(new ScanFilter.Builder().setServiceUuid(BluetoothUuid.HEARING_AID).build());
setFilter(Collections.singletonList(filter)); filterList.add(new ScanFilter.Builder()
.setServiceData(BluetoothUuid.HEARING_AID, new byte[0]).build());
// Filters for LE audio hearing aids
filterList.add(new ScanFilter.Builder().setServiceUuid(BluetoothUuid.HAS).build());
filterList.add(new ScanFilter.Builder()
.setServiceData(BluetoothUuid.HAS, new byte[0]).build());
setFilter(filterList);
} }
@Override @Override