diff options
| -rw-r--r-- | src/com/android/bluetooth/gatt/ScanManager.java | 5 | ||||
| -rw-r--r-- | src/com/android/bluetooth/hfp/HeadsetPhoneState.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/bluetooth/gatt/ScanManager.java b/src/com/android/bluetooth/gatt/ScanManager.java index 27e492f30..af5eeb021 100644 --- a/src/com/android/bluetooth/gatt/ScanManager.java +++ b/src/com/android/bluetooth/gatt/ScanManager.java @@ -441,7 +441,8 @@ public class ScanManager { } void startRegularScan(ScanClient client) { - if (mFilterIndexStack.isEmpty() && isFilteringSupported()) { + if (isFilteringSupported() && mFilterIndexStack.isEmpty() && + mClientFilterIndexMap.isEmpty()) { initFilterIndexStack(); } if (isFilteringSupported()) { @@ -748,7 +749,7 @@ public class ScanManager { if (client.filters == null || client.filters.isEmpty()) { return true; } - return client.filters.size() < mClientFilterIndexMap.size(); + return client.filters.size() > mFilterIndexStack.size(); } private void addFilterToController(int clientIf, ScanFilterQueue.Entry entry, diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java index 8d4e1eebb..ec9637570 100644 --- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java +++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java @@ -93,12 +93,12 @@ class HeadsetPhoneState { // to invoke onSubscriptionInfoChanged and which in turns calls // loadInBackgroud. mSubMgr = SubscriptionManager.from(mContext); - mSubMgr.registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); + mSubMgr.addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); } public void cleanup() { listenForPhoneState(false); - mSubMgr.unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); + mSubMgr.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); mTelephonyManager = null; mStateMachine = null; |