| commit | 175b5a8103da654626d0676d4f062a0cc010ff0f | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Oct 04 14:52:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 14:52:07 2023 +0000 |
| tree | 73882f76f84585b5c95424e1edc09e67e098e093 | |
| parent | c901a0505846f98da034dfd46a7860c24376640f [diff] | |
| parent | 7f5b1b15fb5646fab7893ecc88355fedcaf0b9ab [diff] |
Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: 99c8a5d1e2 am: 38cd577ed9 am: 7f5b1b15fb Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768572 Change-Id: Icdac577bd4ae7cc26c1b35d0196dace2bfea05fa 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(); } }