| commit | 5510af794058e073304ffecb8c04f7ba9d7246c3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 09:51:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:51:15 2023 +0000 |
| tree | 17b61574e1b280b46991cc6b8e34f55bac156e66 | |
| parent | 97b1054a5a6e4ddcd6c390d4dab61a22c89cf8c6 [diff] | |
| parent | 61d52e15ff13ca9fcc1995d05cee42b6f364e4f3 [diff] |
[automerger skipped] Merge Android 14 am: 1c77f09ccd -s ours am: ba69b36026 -s ours am: 61d52e15ff -s ours am skip reason: Merged-In Iad740804a59599dd33add1ea85aa4771e0e4bd35 with SHA-1 aa2f4d839e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777110 Change-Id: I32079b408951aa0be8adced098110c19e296be99 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(); } }