Merge "BLE: Add service solicitation uuid feature in scan filter" am: 83c316c394 (20a8008d) · Commits · e / os / android_packages_modules_Bluetooth

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,15 @@ import java.util.UUID;
		Entry entry = new Entry();
		entry.type = TYPE_SOLICIT_UUID;
		entry.uuid = uuid;
		entry.uuid_mask = new UUID(0, 0);
		mEntries.add(entry);
		}

		void addSolicitUuid(UUID uuid, UUID uuidMask) {
		Entry entry = new Entry();
		entry.type = TYPE_SOLICIT_UUID;
		entry.uuid = uuid;
		entry.uuid_mask = uuidMask;
		mEntries.add(entry);
		}

		@@ -179,6 +188,14 @@ import java.util.UUID;
		addUuid(filter.getServiceUuid().getUuid(), filter.getServiceUuidMask().getUuid());
		}
		}
		if (filter.getServiceSolicitationUuid() != null) {
		if (filter.getServiceSolicitationUuidMask() == null) {
		addSolicitUuid(filter.getServiceSolicitationUuid().getUuid());
		} else {
		addSolicitUuid(filter.getServiceSolicitationUuid().getUuid(),
		filter.getServiceSolicitationUuidMask().getUuid());
		}
		}
		if (filter.getManufacturerData() != null) {
		if (filter.getManufacturerDataMask() == null) {
		addManufacturerData(filter.getManufacturerId(), filter.getManufacturerData());