| commit | 7a23977c573d1c95fe35d65b8ffe26291164810f | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Mon Jul 10 03:19:59 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 10 03:19:59 2023 +0000 |
| tree | 93b64c50f3b6c01689532487a0f6910a44a6645f | |
| parent | ab2bfe5bc9b07e162ee2001eb03fcd46bb764899 [diff] | |
| parent | 1b4bff151d3785fba336a5505c5abee710ef4374 [diff] |
Merge "Duplicate the fd instead of reference" into main am: 2f59689124 am: b238ff2d0c am: b114e91d58 am: 1b4bff151d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2651440 Change-Id: I8683c3bb4488ae138b05b5f1f690407196b772f3 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(); } }