| commit | c7d65e12bb0036de6dbafaff30292c8609644cdb | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Tue Oct 03 09:17:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 09:17:39 2023 +0000 |
| tree | a166ccdba2ab95c2ae7792ac90e85b79ae7c5972 | |
| parent | 70ef32fadabef288fe8ab6ac5a2e329560cd9fc7 [diff] | |
| parent | e49bc2b9a86a1005e6efc4d6b8f41be5dba99a3d [diff] |
Merge "Remove Ikev2VpnProfile related shims usage" into main am: 0509e0da16 am: 1f47e6f2e6 am: e49bc2b9a8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764585 Change-Id: I99cd4f30a0841c4216aeca2b69e623c40e055b4a 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(); } }