summaryrefslogtreecommitdiff
path: root/services/print
diff options
context:
space:
mode:
authorEugene Susla <eugenesusla@google.com>2017-02-23 18:24:39 -0800
committerEugene Susla <eugenesusla@google.com>2017-03-09 17:52:49 -0800
commit36e866b8e0ec08e45b5e7fbc65aeeb3a9bb7b11e (patch)
treec2e3a4f8e95318c934cf844e172373018846d5c5 /services/print
parent40cd0544bc8668a6b1037463847d9245f4b599c5 (diff)
Support multiple filters per association request
By supporting multiple filters per one request we should be able to cover multiple kinds of use cases such as: - Letting the user select from a list of devices of more then one medium type (e.g. Bluetooth and BLE) - Allowing to provide multiple criteria for any field (e.g. filtering by more than one service UUID) Bug: 30932767 Test: Provide multiple filters and ensure that devices matching either are shown in the list to choose from. Ensure wifi SSIDs are shown in the list if wifi filter is provided Change-Id: I0a978787551a1ee5750ec5544b241d3bbfed5a7c
Diffstat (limited to 'services/print')
-rw-r--r--services/print/java/com/android/server/print/CompanionDeviceManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/print/java/com/android/server/print/CompanionDeviceManagerService.java b/services/print/java/com/android/server/print/CompanionDeviceManagerService.java
index ad64e4e6e64d..e6e2cb3d99c9 100644
--- a/services/print/java/com/android/server/print/CompanionDeviceManagerService.java
+++ b/services/print/java/com/android/server/print/CompanionDeviceManagerService.java
@@ -141,7 +141,7 @@ public class CompanionDeviceManagerService extends SystemService {
}
private ServiceConnection getServiceConnection(
- final AssociationRequest<?> request,
+ final AssociationRequest request,
final IFindDeviceCallback findDeviceCallback,
final String callingPackage) {
return new ServiceConnection() {