commit | f6205ab24699ef8ef706c12079a899bf17b8e074 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Oct 03 20:39:46 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 20:39:46 2023 +0000 |
tree | 6375782fa0c1816bb5e5b6180f1d02eb266cda71 | |
parent | e89e198f51597c114de146b99259da0e2f46e0cc [diff] | |
parent | 6e0277842bf36d9094c3fcb4f0fee254294b5ae9 [diff] |
Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main am: 8cfccc9de4 am: 49eeaddfeb am: 6e0277842b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770064 Change-Id: Ic04bd4762580860c9fd765d93e9f8910dcdc62e5 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(); } }