commit 9653e2757354c571ff9354b1b3a2c3282b2af43f
author tturney <tturney@google.com> Mon Apr 13 14:55:07 2015 -0700
committer tturney <tturney@google.com> Mon Apr 13 14:56:27 2015 -0700
tree 11cb64db7808616825478087fd28d1c62e7f0d12
parent c0a7c93812c39589a1c90a18c93ddb3a4e36205a

Fix onLost/onFound logic in isSettingsAndFilterComboAllowed

bug: b/20185066

Change-Id: If9e3fecd12ee86aa12fa63688babeff694bee62e

framework/java/android/bluetooth/le/BluetoothLeScanner.java

diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java
index 73a1907..e184d1e 100644
--- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -409,8 +409,8 @@
                         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;
             }