| commit | cb63970c09299c57ed8a8377d4b541d5c518f8d6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 29 00:41:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 00:41:25 2023 +0000 |
| tree | 66c98559a80c92ce085d4028af07979d7f15ae05 | |
| parent | e257d4c3d5ff1a56f1b63f33723af6333cf08f05 [diff] | |
| parent | 191dd414524eee7b22c89d11bbeef8d15570f0af [diff] |
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 207fdc7ebd -s ours am: 191dd41452 -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: I24d8974078cf75299e55660247f41d8de2dd40e5 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(); } }