commit | 27755563400a0c9ec0cbfe1ec4f91456f57dcacb | [log] [tgz] |
---|---|---|
author | Igor Zaslavsky <igorzas@google.com> | Tue Sep 12 03:05:13 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 12 03:05:13 2023 +0000 |
tree | 3c7306bce58e34e023b915d3d1837b35650e0a2f | |
parent | 55ff1045e9261a81589de9da36867855e4f436fc [diff] | |
parent | 71b1250911145ab7186f4fde5b9544120841081a [diff] |
[resolve-conflict] Implement Discovery PLATFORM logic in Rust am: 3521a5ed8a am: 96bd45aad9 am: 71b1250911 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/24724867 Change-Id: I03792be663ea6fae6aff3052cc010519ae5b0eb2 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(); } }