| commit | be00f97c9a8324d2a88343808b3253b17d4bc76b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 09:57:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:57:12 2023 +0000 |
| tree | 17b61574e1b280b46991cc6b8e34f55bac156e66 | |
| parent | 5510af794058e073304ffecb8c04f7ba9d7246c3 [diff] | |
| parent | ecf9eaebfcadd8e04c1b4929486cc80ebb2b6b6d [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 5a3517e5cd -s ours am: 342fc7c708 -s ours am: ecf9eaebfc -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: I0844ed6919fba21cea26984674c875f98b62b417 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(); } }