| commit | e68739d975916850d3acb156458499441a2fa280 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 14 19:53:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 14 19:53:23 2023 +0000 |
| tree | 1843d34c01577c3078f819ffca2e5fa7b7d362d3 | |
| parent | 1255382b63a157a91623bf267f0bb118c027eee3 [diff] | |
| parent | d412e5cb56fd347faff4b85e2fed1c6b1b9a85d2 [diff] |
Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5 am: b41a17a4f4 am: d412e5cb56 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676841 Change-Id: I4a3f20e2f778946013fc341a3cdeda4a2c410721 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(); } }