| commit | fb934bef0f4be7de8a0f679a5f57908b31ec2ef1 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Tue Oct 03 14:17:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 14:17:30 2023 +0000 |
| tree | 4822e24adc7a7fe2de9439bb00e576332387d373 | |
| parent | b228977a99a8eda9391fc87bb91e9eb9340174ee [diff] | |
| parent | 3ff11de3ba81b47cab6fc6df902a3a7599c5d594 [diff] |
Merge "Prioritize non-slices over slices" into main am: d393732dba am: 98f2f90a82 am: 3ff11de3ba Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760328 Change-Id: I6541a8f7f751e1abccc41c0ac11840520c9bc5f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java index 7ab0523..d69d42d 100644 --- a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java +++ b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
@@ -132,7 +132,6 @@ protected void onSetScanFilters(List<ScanFilter> filters) { synchronized (mLock) { mScanFilters = filters == null ? null : List.copyOf(filters); - updateFiltersLocked(); } }