| commit | b228977a99a8eda9391fc87bb91e9eb9340174ee | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Oct 03 13:28:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 13:28:24 2023 +0000 |
| tree | 9a2b132d23c1644e308d9a402cbdd65d99582661 | |
| parent | c7d65e12bb0036de6dbafaff30292c8609644cdb [diff] | |
| parent | ed6134f519e62fc6a3e53f4f6343399c2cf1b0cd [diff] |
Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main am: a675e966b2 am: 8b3f80c6f7 am: ed6134f519 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749724 Change-Id: I2a8d3cf78156b5072562dcef030861db36ff12e7 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(); } }