| commit | a5f1d7f74a1fbb8663a7751ec4f4c52cb6fc8893 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Mon Aug 28 12:20:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 28 12:20:49 2023 +0000 |
| tree | c211fcdad4312c83d055366771f12c8f75ce1b31 | |
| parent | 9cc1e6613c081483ae145c86013b90c31bb84f8d [diff] | |
| parent | cfc646a4382c17f0e2c2e23bbd39a2d82c4d97ac [diff] |
Merge "Verify VPN underlying network is set as soon as it tries to use it" into main am: 69cd0aa5a0 am: 1bda781fc7 am: cfc646a438 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720155 Change-Id: Id39e352216d4fe08fb42573108f1cdadc46defeb 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(); } }