OSDN Git Service

Support multiple filters per association request
authorEugene Susla <eugenesusla@google.com>
Fri, 24 Feb 2017 02:24:39 +0000 (18:24 -0800)
committerEugene Susla <eugenesusla@google.com>
Fri, 10 Mar 2017 01:52:49 +0000 (17:52 -0800)
commit36e866b8e0ec08e45b5e7fbc65aeeb3a9bb7b11e
treec2e3a4f8e95318c934cf844e172373018846d5c5
parent40cd0544bc8668a6b1037463847d9245f4b599c5
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
19 files changed:
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/bluetooth/le/ScanFilter.java
core/java/android/companion/AssociationRequest.java
core/java/android/companion/BluetoothDeviceFilter.java
core/java/android/companion/BluetoothDeviceFilterUtils.java
core/java/android/companion/BluetoothLEDeviceFilter.java
core/java/android/companion/CompanionDeviceManager.java
core/java/android/companion/DeviceFilter.java
core/java/android/companion/WifiDeviceFilter.java [new file with mode: 0644]
core/java/android/os/Parcel.java
core/java/android/text/TextUtils.java
core/java/com/android/internal/util/ArrayUtils.java
core/java/com/android/internal/util/BitUtils.java [new file with mode: 0644]
packages/CompanionDeviceManager/AndroidManifest.xml
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
services/print/java/com/android/server/print/CompanionDeviceManagerService.java