| commit | e257d4c3d5ff1a56f1b63f33723af6333cf08f05 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 29 00:35:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 00:35:41 2023 +0000 |
| tree | 66c98559a80c92ce085d4028af07979d7f15ae05 | |
| parent | c4ec8ed13aa69fa6c9d382c1c85232874ec4373d [diff] | |
| parent | faeaeb3a164272062c8b5e558266bb7864a75529 [diff] |
[automerger skipped] Merge Android U (ab/10368041) am: 4a6c653160 -s ours am: faeaeb3a16 -s ours am skip reason: Merged-In Iff29b090c0b41d0103997a80788f09c2602df074 with SHA-1 efd7a3e313 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/24180961 Change-Id: I9d336512f76323041f91e53ab10bd9510ceaa195 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(); } }