commit | 9c88d10ce211102226242d0c75c914773f9c11ac | [log] [tgz] |
---|---|---|
author | Paul Hu <paulhu@google.com> | Wed Sep 13 05:33:19 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 05:33:19 2023 +0000 |
tree | 624506262cb1f7350cbfefe3a60e14863dc0d35f | |
parent | 948409e0b08507cd9c72cd30792fed8582e87e35 [diff] | |
parent | 4dabe74442313a365f0af09c6bc33e50619ef65b [diff] |
Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main am: bda7d35533 am: 6002f71400 am: 4dabe74442 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2738817 Change-Id: I13ce609f7d9b7dbb94fb70ee34bd6c4ae9beb8b5 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(); } }