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>
Thu, 9 Mar 2017 00:52:14 +0000 (16:52 -0800)
commite70e6aa62c6f3a9a79624a4f9d97df95edda0364
treec75658771072c342ce6b35d132a2e4363721bcd0
parent35fe82fd542bd030dfdacae848acbcaa6c781a0b
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: I6621da388e2bf4ed97c5af2692629a321d0b63c7
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