diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:15:02 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:15:02 -0700 |
| commit | 40a7fac42afb88359928b08ca036526139c48dd1 (patch) | |
| tree | 74af6612345382f7bf1b7a4b03a453075f38e35f /framework/java/android/bluetooth/le/BluetoothLeScanner.java | |
| parent | 467aff6bb03c185080e94b70ecf71c580681d487 (diff) | |
| parent | 9653e2757354c571ff9354b1b3a2c3282b2af43f (diff) | |
am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release
557d2f5 Merge "Add ConnectivityManager.reportNetworkConnectivity() API" into m-wireless-dev
9653e27 Fix onLost/onFound logic in isSettingsAndFilterComboAllowed
bfd17b7 Add ConnectivityManager.reportNetworkConnectivity() API
c0a7c93 OBEX Over L2CAP + SDP search API for BT profiles
31a94f4 Add ConnectivityManager.getActiveNetwork(). Rework NetID allocation in ConnectivityService so registerNetworkAgent() can return the allocated NetID.
bf18bed Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-dev
db8784e Merge "Cleanup of Video Call pause functionality." into m-wireless-dev
e75b9e3 Non-functional code cleanup of ConnectivityService.
98d25c5 Onfound onlost feature.
0326f58 Merge "API for config app." into m-wireless-dev
e9b056f API for config app.
d5351e7 RTT framework interface update
582b868 Unhide Network.openConnection(URL, Proxy).
0d719ca Fix typos in ConnectivityManager documentation.
Change-Id: Ib4c88f6d7ad1b24227b032555c62a5804194384b
Diffstat (limited to 'framework/java/android/bluetooth/le/BluetoothLeScanner.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/BluetoothLeScanner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java index b6bcfb8d7a..3078951291 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java @@ -409,8 +409,8 @@ public final class BluetoothLeScanner { List <ScanFilter> filterList) { final int callbackType = settings.getCallbackType(); // If onlost/onfound is requested, a non-empty filter is expected - if ((callbackType & ScanSettings.CALLBACK_TYPE_FIRST_MATCH - | ScanSettings.CALLBACK_TYPE_MATCH_LOST) != 0) { + if ((callbackType & (ScanSettings.CALLBACK_TYPE_FIRST_MATCH + | ScanSettings.CALLBACK_TYPE_MATCH_LOST)) != 0) { if (filterList == null) { return false; } |